Sorting source tree a bit
[tpg/acess2.git] / Modules / Filesystems / FAT / fat.c
diff --git a/Modules/Filesystems/FAT/fat.c b/Modules/Filesystems/FAT/fat.c
deleted file mode 100644 (file)
index f5d1916..0000000
+++ /dev/null
@@ -1,1538 +0,0 @@
-/*\r
- * Acess 2\r
- * FAT12/16/32 Driver Version (Incl LFN)\r
- * \r
- * NOTE: This driver will only support _reading_ long file names, not\r
- * writing. I don't even know why I'm adding write-support. FAT sucks.\r
- * \r
- * Known Bugs:\r
- * - LFN Is buggy in FAT_ReadDir\r
- * \r
- * Notes:\r
- * - There's hard-coded 512 byte sectors everywhere, that needs to be\r
- *   cleaned.\r
- * - Thread safety is out the window with the write and LFN code\r
- */\r
-/**\r
- * \todo Implement changing of the parent directory when a file is written to\r
- * \todo Implement file creation / deletion\r
- */\r
-#define DEBUG  0\r
-#define VERBOSE        1\r
-\r
-#define CACHE_FAT      0       //!< Caches the FAT in memory\r
-#define USE_LFN                1       //!< Enables the use of Long File Names\r
-#define        SUPPORT_WRITE   0       //!< Enables write support\r
-\r
-#include <acess.h>\r
-#include <modules.h>\r
-#include <vfs.h>\r
-#include "fs_fat.h"\r
-\r
-#define FAT_FLAG_DIRTY 0x10000\r
-#define FAT_FLAG_DELETE        0x20000\r
-\r
-// === TYPES ===\r
-#if USE_LFN\r
-/**\r
- * \brief Long-Filename cache entry\r
- */\r
-typedef struct sFAT_LFNCacheEnt\r
-{\r
-        int    ID;\r
-       // TODO: Handle UTF16 names correctly\r
-       char    Data[256];\r
-}      tFAT_LFNCacheEnt;\r
-/**\r
- * \brief Long-Filename cache\r
- */\r
-typedef struct sFAT_LFNCache\r
-{\r
-        int    NumEntries;\r
-       tFAT_LFNCacheEnt        Entries[];\r
-}      tFAT_LFNCache;\r
-#endif\r
-\r
-// === PROTOTYPES ===\r
-// --- Driver Core\r
- int   FAT_Install(char **Arguments);\r
-tVFS_Node      *FAT_InitDevice(const char *device, const char **options);\r
-void   FAT_Unmount(tVFS_Node *Node);\r
-// --- Helpers\r
- int   FAT_int_GetAddress(tVFS_Node *Node, Uint64 Offset, Uint64 *Addr, Uint32 *Cluster);\r
-Uint32 FAT_int_GetFatValue(tFAT_VolInfo *Disk, Uint32 Cluster);\r
-#if SUPPORT_WRITE\r
-Uint32 FAT_int_AllocateCluster(tFAT_VolInfo *Disk, Uint32 Previous);\r
-Uint32 FAT_int_FreeCluster(tFAT_VolInfo *Disk, Uint32 Cluster);\r
-#endif\r
-void   FAT_int_ReadCluster(tFAT_VolInfo *Disk, Uint32 Cluster, int Length, void *Buffer);\r
-// --- File IO\r
-Uint64 FAT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
-#if SUPPORT_WRITE\r
-void   FAT_int_WriteCluster(tFAT_VolInfo *Disk, Uint32 Cluster, void *Buffer);\r
-Uint64 FAT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
-#endif\r
-// --- Directory IO\r
-char   *FAT_ReadDir(tVFS_Node *Node, int ID);\r
-tVFS_Node      *FAT_FindDir(tVFS_Node *Node, const char *Name);\r
-tVFS_Node      *FAT_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode);\r
-#if SUPPORT_WRITE\r
- int   FAT_Mknod(tVFS_Node *Node, const char *Name, Uint Flags);\r
- int   FAT_Relink(tVFS_Node *node, const char *OldName, const char *NewName);\r
-#endif\r
-void   FAT_CloseFile(tVFS_Node *node);\r
-\r
-// === Options ===\r
- int   giFAT_MaxCachedClusters = 1024*512/4;\r
-\r
-// === SEMI-GLOBALS ===\r
-MODULE_DEFINE(0, (0<<8)|50 /*v0.50*/, VFAT, FAT_Install, NULL, NULL);\r
-tFAT_VolInfo   gFAT_Disks[8];\r
- int   giFAT_PartCount = 0;\r
-tVFS_Driver    gFAT_FSInfo = {"fat", 0, FAT_InitDevice, FAT_Unmount, FAT_GetNodeFromINode, NULL};\r
-tVFS_NodeType  gFAT_DirType = {\r
-       .TypeName = "FAT-Dir",\r
-       .ReadDir = FAT_ReadDir,\r
-       .FindDir = FAT_FindDir,\r
-       #if SUPPORT_WRITE\r
-       .MkNod = FAT_Mknod,\r
-       .Relink = FAT_Relink,\r
-       #endif\r
-       .Close = FAT_CloseFile\r
-       };\r
-tVFS_NodeType  gFAT_FileType = {\r
-       .TypeName = "FAT-File",\r
-       .Read = FAT_Read,\r
-       #if SUPPORT_WRITE\r
-       .Write = FAT_Write,\r
-       #endif\r
-       .Close = FAT_CloseFile\r
-       };\r
-\r
-// === CODE ===\r
-/**\r
- * \fn int FAT_Install(char **Arguments)\r
- * \brief Install the FAT Driver\r
- */\r
-int FAT_Install(char **Arguments)\r
-{\r
-       VFS_AddDriver( &gFAT_FSInfo );\r
-       return MODULE_ERR_OK;\r
-}\r
-\r
-/**\r
- * \brief Reads the boot sector of a disk and prepares the structures for it\r
- */\r
-tVFS_Node *FAT_InitDevice(const char *Device, const char **Options)\r
-{\r
-       fat_bootsect *bs;\r
-        int    i;\r
-       Uint32  FATSz, RootDirSectors, TotSec;\r
-       tVFS_Node       *node = NULL;\r
-       tFAT_VolInfo    *diskInfo = &gFAT_Disks[giFAT_PartCount];\r
-       \r
-       // Temporary Pointer\r
-       bs = &diskInfo->bootsect;\r
-       \r
-       // Open device and read boot sector\r
-       diskInfo->fileHandle = VFS_Open(Device, VFS_OPENFLAG_READ|VFS_OPENFLAG_WRITE);\r
-       if(diskInfo->fileHandle == -1) {\r
-               Log_Notice("FAT", "Unable to open device '%s'", Device);\r
-               return NULL;\r
-       }\r
-       \r
-       VFS_ReadAt(diskInfo->fileHandle, 0, 512, bs);\r
-       \r
-       if(bs->bps == 0 || bs->spc == 0) {\r
-               Log_Notice("FAT", "Error in FAT Boot Sector");\r
-               return NULL;\r
-       }\r
-       \r
-       // FAT Type Determining\r
-       // - From Microsoft FAT Specifcation\r
-       RootDirSectors = ((bs->files_in_root*32) + (bs->bps - 1)) / bs->bps;\r
-       \r
-       if(bs->fatSz16 != 0)\r
-               FATSz = bs->fatSz16;\r
-       else\r
-               FATSz = bs->spec.fat32.fatSz32;\r
-       \r
-       if(bs->totalSect16 != 0)\r
-               TotSec = bs->totalSect16;\r
-       else\r
-               TotSec = bs->totalSect32;\r
-       \r
-       diskInfo->ClusterCount = (TotSec - (bs->resvSectCount + (bs->fatCount * FATSz) + RootDirSectors)) / bs->spc;\r
-       \r
-       if(diskInfo->ClusterCount < 4085)\r
-               diskInfo->type = FAT12;\r
-       else if(diskInfo->ClusterCount < 65525)\r
-               diskInfo->type = FAT16;\r
-       else\r
-               diskInfo->type = FAT32;\r
-       \r
-       #if VERBOSE\r
-       {\r
-               char    *sFatType, *sSize;\r
-               Uint    iSize = diskInfo->ClusterCount * bs->spc * bs->bps / 1024;\r
-               \r
-               switch(diskInfo->type)\r
-               {\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
-               else if(iSize <= 2*1024*1024) {\r
-                       sSize = "MiB";\r
-                       iSize >>= 10;\r
-               }\r
-               else {\r
-                       sSize = "GiB";\r
-                       iSize >>= 20;\r
-               }\r
-               Log_Notice("FAT", "'%s' %s, %i %s", Device, sFatType, iSize, sSize);\r
-       }\r
-       #endif\r
-       \r
-       // Get Name\r
-       if(diskInfo->type == FAT32) {\r
-               for(i=0;i<11;i++)\r
-                       diskInfo->name[i] = (bs->spec.fat32.label[i] == ' ' ? '\0' : bs->spec.fat32.label[i]);\r
-       }\r
-       else {\r
-               for(i=0;i<11;i++)\r
-                       diskInfo->name[i] = (bs->spec.fat16.label[i] == ' ' ? '\0' : bs->spec.fat16.label[i]);\r
-       }\r
-       diskInfo->name[11] = '\0';\r
-       \r
-       // Compute Root directory offset\r
-       if(diskInfo->type == FAT32)\r
-               diskInfo->rootOffset = bs->spec.fat32.rootClust;\r
-       else\r
-               diskInfo->rootOffset = (FATSz * bs->fatCount) / bs->spc;\r
-       \r
-       diskInfo->firstDataSect = bs->resvSectCount + (bs->fatCount * FATSz) + RootDirSectors;\r
-       \r
-       //Allow for Caching the FAT\r
-       #if CACHE_FAT\r
-       if( diskInfo->ClusterCount <= giFAT_MaxCachedClusters )\r
-       {\r
-               Uint32  Ofs;\r
-               diskInfo->FATCache = (Uint32*)malloc(sizeof(Uint32)*diskInfo->ClusterCount);\r
-               if(diskInfo->FATCache == NULL) {\r
-                       Log_Warning("FAT", "Heap Exhausted");\r
-                       return NULL;\r
-               }\r
-               Ofs = bs->resvSectCount*512;\r
-               if(diskInfo->type == FAT12)\r
-               {\r
-                       Uint32  val;\r
-                        int    j;\r
-                       char    buf[1536];\r
-                       for(i = 0; i < diskInfo->ClusterCount/2; i++) {\r
-                               j = i & 511;    //%512\r
-                               if( j == 0 ) {\r
-                                       VFS_ReadAt(diskInfo->fileHandle, Ofs, 3*512, buf);\r
-                                       Ofs += 3*512;\r
-                               }\r
-                               val = *((int*)(buf+j*3));\r
-                               diskInfo->FATCache[i*2] = val & 0xFFF;\r
-                               diskInfo->FATCache[i*2+1] = (val>>12) & 0xFFF;\r
-                       }\r
-               }\r
-               else if(diskInfo->type == FAT16)\r
-               {\r
-                       Uint16  buf[256];\r
-                       for(i=0;i<diskInfo->ClusterCount;i++) {\r
-                               if( (i & 255) == 0 ) {\r
-                                       VFS_ReadAt(diskInfo->fileHandle, Ofs, 512, buf);\r
-                                       Ofs += 512;\r
-                               }\r
-                               diskInfo->FATCache[i] = buf[i&255];\r
-                       }\r
-               }\r
-               else if(diskInfo->type == FAT32)\r
-               {\r
-                       Uint32  buf[128];\r
-                       for(i=0;i<diskInfo->ClusterCount;i++) {\r
-                               if( (i & 127) == 0 ) {\r
-                                       VFS_ReadAt(diskInfo->fileHandle, Ofs, 512, buf);\r
-                                       Ofs += 512;\r
-                               }\r
-                               diskInfo->FATCache[i] = buf[i&127];\r
-                       }\r
-               }\r
-               LOG("FAT Fully Cached");\r
-       }\r
-       #endif /*CACHE_FAT*/\r
-       \r
-       diskInfo->BytesPerCluster = bs->spc * bs->bps;\r
-       \r
-       // Initalise inode cache for filesystem\r
-       diskInfo->inodeHandle = Inode_GetHandle();\r
-       LOG("Inode Cache handle is %i", diskInfo->inodeHandle);\r
-       \r
-       // == VFS Interface\r
-       node = &diskInfo->rootNode;\r
-       //node->Size = bs->files_in_root;\r
-       node->Size = -1;\r
-       node->Inode = diskInfo->rootOffset;     // 0:31 - Cluster, 32:63 - Parent Directory Cluster\r
-       node->ImplPtr = diskInfo;       // Disk info pointer\r
-       node->ImplInt = 0;      // 0:15 - Directory Index, 16: Dirty Flag, 17: Deletion Flag\r
-       \r
-       node->ReferenceCount = 1;\r
-       \r
-       node->UID = 0;  node->GID = 0;\r
-       node->NumACLs = 1;\r
-       node->ACLs = &gVFS_ACL_EveryoneRWX;\r
-       node->Flags = VFS_FFLAG_DIRECTORY;\r
-       node->CTime = node->MTime = node->ATime = now();\r
-\r
-       node->Type = &gFAT_DirType;     \r
-       \r
-       giFAT_PartCount ++;\r
-       return node;\r
-}\r
-\r
-/**\r
- * \brief Closes a mount and marks it as free\r
- * \param Node Mount Root\r
- * \r
- * \todo Remove FAT Cache\r
- * \todo Clear LFN Cache\r
- * \todo Check that all files are closed and flushed\r
- */\r
-void FAT_Unmount(tVFS_Node *Node)\r
-{\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       \r
-       // Close Disk Handle\r
-       VFS_Close( disk->fileHandle );\r
-       // Clear Node Cache\r
-       Inode_ClearCache(disk->inodeHandle);\r
-       // Mark as unused\r
-       disk->fileHandle = -2;\r
-       return;\r
-}\r
-\r
-/**\r
- * \brief Converts an offset in a file into a disk address\r
- * \param Node File (or directory) node\r
- * \param Offset       Offset in the file\r
- * \param Addr Return Address\r
- * \param Cluster      Set to the current cluster (or the last one if \a Offset\r
- *                  is past EOC) - Not touched if the node is the root\r
- *                  directory.\r
- * \return Zero on success, non-zero on error\r
- */\r
-int FAT_int_GetAddress(tVFS_Node *Node, Uint64 Offset, Uint64 *Addr, Uint32 *Cluster)\r
-{\r
-       Uint32  cluster;\r
-       Uint64  addr;\r
-        int    skip;\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       \r
-       ENTER("pNode XOffset", Node, Offset);\r
-       \r
-       cluster = Node->Inode & 0xFFFFFFF;      // Cluster ID\r
-       LOG("cluster = 0x%07x", cluster);\r
-       \r
-       // Do Cluster Skip\r
-       // - Pre FAT32 had a reserved area for the root.\r
-       if( disk->type == FAT32 || cluster != disk->rootOffset )\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
-               }\r
-               if(Cluster)     *Cluster = cluster;\r
-       }\r
-       else {\r
-               // Increment by clusters in offset\r
-               cluster += Offset / disk->BytesPerCluster;\r
-       }\r
-       \r
-       LOG("cluster = %08x", cluster);\r
-       \r
-       // Bounds Checking (Used to spot corruption)\r
-       if(cluster > disk->ClusterCount + 2)\r
-       {\r
-               Log_Warning("FAT", "Cluster ID is over cluster count (0x%x>0x%x)",\r
-                       cluster, disk->ClusterCount+2);\r
-               LEAVE('i', 1);\r
-               return 1;\r
-       }\r
-       \r
-       // Compute Offsets\r
-       // - Pre FAT32 cluster base (in sectors)\r
-       if( 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
-       // In-cluster offset\r
-       addr += Offset % disk->BytesPerCluster;\r
-       \r
-       LOG("addr = 0x%08x", addr);\r
-       *Addr = addr;\r
-       LEAVE('i', 0);\r
-       return 0;\r
-}\r
-\r
-/*\r
- * ====================\r
- *   FAT Manipulation\r
- * ====================\r
- */\r
-/**\r
- * \fn Uint32 FAT_int_GetFatValue(tFAT_VolInfo *Disk, Uint32 cluster)\r
- * \brief Fetches a value from the FAT\r
- */\r
-Uint32 FAT_int_GetFatValue(tFAT_VolInfo *Disk, Uint32 cluster)\r
-{\r
-       Uint32  val = 0;\r
-       Uint32  ofs;\r
-       ENTER("pDisk xCluster", Disk, cluster);\r
-       Mutex_Acquire( &Disk->lFAT );\r
-       #if CACHE_FAT\r
-       if( Disk->ClusterCount <= giFAT_MaxCachedClusters )\r
-       {\r
-               val = Disk->FATCache[cluster];\r
-               if(Disk->type == FAT12 && val == EOC_FAT12)     val = -1;\r
-               if(Disk->type == FAT16 && val == EOC_FAT16)     val = -1;\r
-               if(Disk->type == FAT32 && val == EOC_FAT32)     val = -1;\r
-       }\r
-       else\r
-       {\r
-       #endif\r
-               ofs = Disk->bootsect.resvSectCount*512;\r
-               if(Disk->type == FAT12) {\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+(cluster/2)*3, 3, &val);\r
-                       val = (cluster & 1 ? val>>12 : val & 0xFFF);\r
-                       if(val == EOC_FAT12)    val = -1;\r
-               } else if(Disk->type == FAT16) {\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+cluster*2, 2, &val);\r
-                       if(val == EOC_FAT16)    val = -1;\r
-               } else {\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+cluster*4, 4, &val);\r
-                       if(val == EOC_FAT32)    val = -1;\r
-               }\r
-       #if CACHE_FAT\r
-       }\r
-       #endif /*CACHE_FAT*/\r
-       Mutex_Release( &Disk->lFAT );\r
-       LEAVE('x', val);\r
-       return val;\r
-}\r
-\r
-#if SUPPORT_WRITE\r
-/**\r
- * \brief Allocate a new cluster\r
- */\r
-Uint32 FAT_int_AllocateCluster(tFAT_VolInfo *Disk, Uint32 Previous)\r
-{\r
-       Uint32  ret = Previous;\r
-       #if CACHE_FAT\r
-       if( Disk->ClusterCount <= giFAT_MaxCachedClusters )\r
-       {\r
-               Uint32  eoc;\r
-               \r
-               LOCK(Disk->lFAT);\r
-               for(ret = Previous; ret < Disk->ClusterCount; ret++)\r
-               {\r
-                       if(Disk->FATCache[ret] == 0)\r
-                               goto append;\r
-               }\r
-               for(ret = 0; ret < Previous; ret++)\r
-               {\r
-                       if(Disk->FATCache[ret] == 0)\r
-                               goto append;\r
-               }\r
-               \r
-               RELEASE(Disk->lFAT);\r
-               return 0;\r
-       \r
-       append:\r
-               switch(Disk->type)\r
-               {\r
-               case FAT12:     eoc = EOC_FAT12;        break;\r
-               case FAT16:     eoc = EOC_FAT16;        break;\r
-               case FAT32:     eoc = EOC_FAT32;        break;\r
-               default:        return 0;\r
-               }\r
-               \r
-               Disk->FATCache[ret] = eoc;\r
-               Disk->FATCache[Previous] = ret;\r
-               \r
-               RELEASE(Disk->lFAT);\r
-               return ret;\r
-       }\r
-       else\r
-       {\r
-       #endif\r
-               Uint32  val;\r
-               Uint32  ofs = Disk->bootsect.resvSectCount*512;\r
-               Log_Warning("FAT", "TODO: Implement cluster allocation with non cached FAT");\r
-               return 0;\r
-               \r
-               switch(Disk->type)\r
-               {\r
-               case FAT12:\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+(Previous>>1)*3, 3, &val);\r
-                       if( Previous & 1 ) {\r
-                               val &= 0xFFF000;\r
-                               val |= ret;\r
-                       }\r
-                       else {\r
-                               val &= 0xFFF;\r
-                               val |= ret<<12;\r
-                       }\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+(Previous>>1)*3, 3, &val);\r
-                       \r
-                       VFS_ReadAt(Disk->fileHandle, ofs+(ret>>1)*3, 3, &val);\r
-                       if( Cluster & 1 ) {\r
-                               val &= 0xFFF000;\r
-                               val |= eoc;\r
-                       }\r
-                       else {\r
-                               val &= 0x000FFF;\r
-                               val |= eoc<<12;\r
-                       }\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+(ret>>1)*3, 3, &val);\r
-                       break;\r
-               case FAT16:\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+Previous*2, 2, &ret);\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+ret*2, 2, &eoc);\r
-                       break;\r
-               case FAT32:\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+Previous*4, 4, &ret);\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+ret*4, 4, &eoc);\r
-                       break;\r
-               }\r
-               return ret;\r
-       #if CACHE_FAT\r
-       }\r
-       #endif\r
-}\r
-\r
-/**\r
- * \brief Free's a cluster\r
- * \return The original contents of the cluster\r
- */\r
-Uint32 FAT_int_FreeCluster(tFAT_VolInfo *Disk, Uint32 Cluster)\r
-{\r
-       Uint32  ret;\r
-       #if CACHE_FAT\r
-       if( Disk->ClusterCount <= giFAT_MaxCachedClusters )\r
-       {\r
-               LOCK(Disk->lFAT);\r
-               \r
-               ret = Disk->FATCache[Cluster];\r
-               Disk->FATCache[Cluster] = 0;\r
-               \r
-               RELEASE(Disk->lFAT);\r
-       }\r
-       else\r
-       {\r
-       #endif\r
-               Uint32  val;\r
-               Uint32  ofs = Disk->bootsect.resvSectCount*512;\r
-               LOCK(Disk->lFAT);\r
-               switch(Disk->type)\r
-               {\r
-               case FAT12:\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+(Cluster>>1)*3, 3, &val);\r
-                       if( Cluster & 1 ) {\r
-                               ret = val & 0xFFF0000;\r
-                               val &= 0xFFF;\r
-                       }\r
-                       else {\r
-                               ret = val & 0xFFF;\r
-                               val &= 0xFFF000;\r
-                       }\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+(Previous>>1)*3, 3, &val);\r
-                       break;\r
-               case FAT16:\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+Previous*2, 2, &ret);\r
-                       val = 0;\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+Cluster*2, 2, &val);\r
-                       break;\r
-               case FAT32:\r
-                       VFS_ReadAt(Disk->fileHandle, ofs+Previous*4, 4, &ret);\r
-                       val = 0;\r
-                       VFS_WriteAt(Disk->fileHandle, ofs+Cluster*2, 2, &val);\r
-                       break;\r
-               }\r
-               RELEASE(Disk->lFAT);\r
-       #if CACHE_FAT\r
-       }\r
-       #endif\r
-       if(Disk->type == FAT12 && ret == EOC_FAT12)     ret = -1;\r
-       if(Disk->type == FAT16 && ret == EOC_FAT16)     ret = -1;\r
-       if(Disk->type == FAT32 && ret == EOC_FAT32)     ret = -1;\r
-       return ret;\r
-}\r
-#endif\r
-\r
-/*\r
- * ====================\r
- *      Cluster IO\r
- * ====================\r
- */\r
-/**\r
- * \brief Read a cluster\r
- * \param Disk Disk (Volume) to read from\r
- * \param Length       Length to read\r
- * \param Buffer       Destination for read data\r
- */\r
-void FAT_int_ReadCluster(tFAT_VolInfo *Disk, Uint32 Cluster, int Length, void *Buffer)\r
-{\r
-       ENTER("pDisk xCluster iLength pBuffer", Disk, Cluster, Length, Buffer);\r
-       VFS_ReadAt(\r
-               Disk->fileHandle,\r
-               (Disk->firstDataSect + (Cluster-2)*Disk->bootsect.spc )\r
-                       * Disk->bootsect.bps,\r
-               Length,\r
-               Buffer\r
-               );\r
-       LEAVE('-');\r
-}\r
-\r
-/* ====================\r
- *       File IO\r
- * ====================\r
- */\r
-/**\r
- * \fn Uint64 FAT_Read(tVFS_Node *node, Uint64 offset, Uint64 length, void *buffer)\r
- * \brief Reads data from a specified file\r
- */\r
-Uint64 FAT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
-{\r
-        int    preSkip, count;\r
-       Uint64  final_bytes;\r
-        int    i, cluster, pos;\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       char    tmpBuf[disk->BytesPerCluster];\r
-        int    bpc = disk->BytesPerCluster;\r
-       \r
-       ENTER("pNode Xoffset Xlength pbuffer", Node, Offset, Length, Buffer);\r
-       \r
-       // Sanity Check offset\r
-       if(Offset > Node->Size) {\r
-               LOG("Seek past EOF (%i > %i)", Offset, Node->Size);\r
-               LEAVE('i', 0);\r
-               return 0;\r
-       }\r
-       \r
-       // Cluster is stored in the low 32-bits of the Inode field\r
-       cluster = Node->Inode & 0xFFFFFFFF;\r
-       \r
-       // Clamp Size\r
-       if(Offset + Length > Node->Size) {\r
-               LOG("Reading past EOF (%lli + %lli > %lli), clamped to %lli",\r
-                       Offset, Length, Node->Size, Node->Size - Offset);\r
-               Length = Node->Size - Offset;\r
-       }\r
-       \r
-       // Skip previous clusters\r
-       preSkip = Offset / bpc;\r
-       Offset %= bpc;\r
-       LOG("preSkip = %i, Offset = %i", preSkip, (int)Offset);\r
-       for(i = preSkip; i--; )\r
-       {\r
-               cluster = FAT_int_GetFatValue(disk, cluster);\r
-               if(cluster == -1) {\r
-                       Log_Warning("FAT", "Offset is past end of cluster chain mark");\r
-                       LEAVE('i', 0);\r
-                       return 0;\r
-               }\r
-       }\r
-\r
-       // Reading from within one cluster\r
-       if((int)Offset + (int)Length <= bpc)\r
-       {\r
-               LOG("single cluster only");\r
-               FAT_int_ReadCluster(disk, cluster, bpc, tmpBuf);\r
-               memcpy( Buffer, (void*)( tmpBuf + Offset%bpc ), Length );\r
-               LEAVE('X', Length);\r
-               return Length;\r
-       }\r
-       \r
-       // Align read to a cluster\r
-       if( Offset > 0 )\r
-       {\r
-               pos = bpc - Offset;\r
-               FAT_int_ReadCluster(disk, cluster, bpc, tmpBuf);\r
-               memcpy( Buffer, (void*)( tmpBuf + Offset ), pos );\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
-                       Log_Warning("FAT", "Read past End of Cluster Chain (Align)");\r
-                       LEAVE('X', pos);\r
-                       return pos;\r
-               }\r
-       }\r
-       else\r
-               pos = 0;\r
-\r
-       // Get Count of Clusters to read\r
-//     count = DivMod64U(Length - pos, bpc, &final_bytes);\r
-       count = (Length - pos) / bpc;\r
-       final_bytes = (Length - pos) % bpc;\r
-       LOG("Offset = %i, Length = %i, count = %i, final_bytes = %i", (int)Offset, (int)Length, count, final_bytes);\r
-       \r
-       // Read the rest of the cluster data\r
-       for( ; count; count -- )\r
-       {\r
-               if(cluster == -1) {\r
-                       Log_Warning("FAT", "Read past End of Cluster Chain (Bulk)");\r
-                       LEAVE('X', pos);\r
-                       return pos;\r
-               }\r
-               // Read cluster\r
-               FAT_int_ReadCluster(disk, cluster, bpc, (void*)(Buffer+pos));\r
-               pos += bpc;\r
-               // Get next cluster in the chain\r
-               cluster = FAT_int_GetFatValue(disk, cluster);\r
-       }\r
-\r
-       if( final_bytes > 0 )\r
-       {\r
-               if(cluster == -1) {\r
-                       Log_Warning("FAT", "Read past End of Cluster Chain (Final)");\r
-                       LEAVE('X', pos);\r
-                       return pos;\r
-               }\r
-               // Read final cluster\r
-               FAT_int_ReadCluster( disk, cluster, bpc, tmpBuf );\r
-               memcpy( (void*)(Buffer+pos), tmpBuf, Length-pos );\r
-       }\r
-               \r
-       #if DEBUG\r
-       //Debug_HexDump("FAT_Read", Buffer, Length);\r
-       #endif\r
-       \r
-       LEAVE('X', Length);\r
-       return Length;\r
-}\r
-\r
-#if SUPPORT_WRITE\r
-/**\r
- * \brief Write a cluster to disk\r
- */\r
-void FAT_int_WriteCluster(tFAT_VolInfo *Disk, Uint32 Cluster, void *Buffer)\r
-{\r
-       ENTER("pDisk xCluster pBuffer", Disk, Cluster, Buffer);\r
-       VFS_ReadAt(\r
-               Disk->fileHandle,\r
-               (Disk->firstDataSect + (Cluster-2)*Disk->bootsect.spc )\r
-                       * Disk->bootsect.bps,\r
-               Disk->BytesPerCluster,\r
-               Buffer\r
-               );\r
-       LEAVE('-');\r
-}\r
-\r
-/**\r
- * \brief Write to a file\r
- * \param Node File Node\r
- * \param Offset       Offset within file\r
- * \param Length       Size of data to write\r
- * \param Buffer       Data source\r
- */\r
-Uint64 FAT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
-{\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       char    tmpBuf[disk->BytesPerCluster];\r
-        int    remLength = Length;\r
-       Uint32  cluster, tmpCluster;\r
-        int    bNewCluster = 0;\r
-       \r
-       if(Offset > Node->Size) return 0;\r
-       \r
-       // Seek Clusters\r
-       cluster = Node->Inode & 0xFFFFFFFF;\r
-       while( Offset > disk->BytesPerCluster )\r
-       {\r
-               cluster = FAT_int_GetFatValue( disk, cluster );\r
-               if(cluster == -1) {\r
-                       Log_Warning("FAT", "EOC Unexpectedly Reached");\r
-                       return 0;\r
-               }\r
-               Offset -= disk->BytesPerCluster;\r
-       }\r
-       if( Offset == disk->BytesPerCluster )\r
-       {\r
-               Uint32  tmp = FAT_int_AllocateCluster(disk, cluster);\r
-               if(!tmp)        return 0;\r
-               cluster = tmp;\r
-               Offset -= disk->BytesPerCluster;\r
-       }\r
-       \r
-       if( Offset + Length < disk->BytesPerCluster )\r
-       {\r
-               char    tmpBuf[disk->BytesPerCluster];\r
-               \r
-               // Read-Modify-Write\r
-               FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
-               memcpy( tmpBuf + Offset, Buffer, Length );\r
-               FAT_int_WriteCluster( disk, cluster, tmpBuf );\r
-               \r
-               return Length;\r
-       }\r
-       \r
-       // Clean up changes within a cluster\r
-       if( Offset )\r
-       {       \r
-               // Read-Modify-Write\r
-               FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
-               memcpy( tmpBuf + Offset, Buffer, disk->BytesPerCluster - Offset );\r
-               FAT_int_WriteCluster( disk, cluster, tmpBuf );\r
-               \r
-               remLength -= disk->BytesPerCluster - Offset;\r
-               Buffer += disk->BytesPerCluster - Offset;\r
-               \r
-               // Get next cluster (allocating if needed)\r
-               tmpCluster = FAT_int_GetFatValue(disk, cluster);\r
-               if(tmpCluster == -1) {\r
-                       tmpCluster = FAT_int_AllocateCluster(disk, cluster);\r
-                       if( tmpCluster == 0 ) {\r
-                               return Length - remLength;\r
-                       }\r
-               }\r
-               cluster = tmpCluster;\r
-       }\r
-       \r
-       while( remLength > disk->BytesPerCluster )\r
-       {\r
-               FAT_int_WriteCluster( disk, cluster, Buffer );\r
-               Buffer += disk->BytesPerCluster;\r
-               \r
-               // Get next cluster (allocating if needed)\r
-               tmpCluster = FAT_int_GetFatValue(disk, cluster);\r
-               if(tmpCluster == -1) {\r
-                       bNewCluster = 1;\r
-                       tmpCluster = FAT_int_AllocateCluster(disk, cluster);\r
-                       if( tmpCluster == 0 ) {\r
-                               return Length - remLength;\r
-                       }\r
-               }\r
-               cluster = tmpCluster;\r
-       }\r
-       \r
-       // Finish off\r
-       tmpBuf = malloc( disk->BytesPerCluster );\r
-       if( bNewCluster )\r
-               memset(tmpBuf, 0, disk->BytesPerCluster);\r
-       else\r
-               FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
-       memcpy( tmpBuf, Buffer, remLength );\r
-       FAT_int_WriteCluster( disk, cluster, tmpBuf );\r
-       free( tmpBuf );\r
-       \r
-       return Length;\r
-}\r
-#endif\r
-\r
-/* ====================\r
- *  File Names & Nodes\r
- * ====================\r
- */\r
-/**\r
- * \brief Converts a FAT directory entry name into a proper filename\r
- * \param dest Destination array (must be at least 13 bytes in size)\r
- * \param src  8.3 filename (concatenated, e.g 'FILE1   TXT')\r
- */\r
-void FAT_int_ProperFilename(char *dest, const char *src)\r
-{\r
-        int    inpos, outpos;\r
-       \r
-       // Name\r
-       outpos = 0;\r
-       for( inpos = 0; inpos < 8; inpos++ ) {\r
-               if(src[inpos] == ' ')   break;\r
-               dest[outpos++] = src[inpos];\r
-       }\r
-       inpos = 8;\r
-       // Check for empty extensions\r
-       if(src[8] != ' ')\r
-       {\r
-               dest[outpos++] = '.';\r
-               for( ; inpos < 11; inpos++)     {\r
-                       if(src[inpos] == ' ')   break;\r
-                       dest[outpos++] = src[inpos];\r
-               }\r
-       }\r
-       dest[outpos++] = '\0';\r
-       \r
-       //LOG("dest='%s'", dest);\r
-}\r
-\r
-/**\r
- * \fn char *FAT_int_CreateName(fat_filetable *ft, char *LongFileName)\r
- * \brief Converts either a LFN or a 8.3 Name into a proper name\r
- * \param ft   Pointer to the file's entry in the parent directory\r
- * \param LongFileName Long file name pointer\r
- * \return Filename as a heap string\r
- */\r
-char *FAT_int_CreateName(fat_filetable *ft, char *LongFileName)\r
-{\r
-       char    *ret;\r
-       ENTER("pft sLongFileName", ft, LongFileName);\r
-       //Log_Debug("FAT", "FAT_int_CreateName(ft=%p, LongFileName=%p'%s')", ft, LongFileName);\r
-       #if USE_LFN\r
-       if(LongFileName && LongFileName[0] != '\0')\r
-       {       \r
-               ret = strdup(LongFileName);\r
-       }\r
-       else\r
-       {\r
-       #endif\r
-               ret = (char*) malloc(13);\r
-               if( !ret ) {\r
-                       Log_Warning("FAT", "FAT_int_CreateName: malloc(13) failed");\r
-                       return NULL;\r
-               }\r
-               FAT_int_ProperFilename(ret, ft->name);\r
-       #if USE_LFN\r
-       }\r
-       #endif\r
-       LEAVE('s', ret);\r
-       return ret;\r
-}\r
-\r
-/**\r
- * \brief Creates a tVFS_Node structure for a given file entry\r
- * \param Parent       Parent directory VFS node\r
- * \param Entry        File table entry for the new node\r
- * \param Pos  Position in the parent of the new node\r
- */\r
-tVFS_Node *FAT_int_CreateNode(tVFS_Node *Parent, fat_filetable *Entry, int Pos)\r
-{\r
-       tVFS_Node       node;\r
-       tVFS_Node       *ret;\r
-       tFAT_VolInfo    *disk = Parent->ImplPtr;\r
-       \r
-       ENTER("pParent pFT", Parent, Entry);\r
-       LOG("disk = %p", disk);\r
-       \r
-       memset(&node, 0, sizeof(tVFS_Node));\r
-       \r
-       // Set Other Data\r
-       // 0-27: Cluster, 32-59: Parent Cluster\r
-       node.Inode = Entry->cluster | (Entry->clusterHi<<16) | (Parent->Inode << 32);\r
-       LOG("node.Inode = %llx", node.Inode);\r
-       // Position in parent directory\r
-       node.ImplInt = Pos & 0xFFFF;\r
-       // Disk Pointer\r
-       node.ImplPtr = disk;\r
-       node.Size = Entry->size;\r
-       LOG("Entry->size = %i", Entry->size);\r
-       // root:root\r
-       node.UID = 0;   node.GID = 0;\r
-       node.NumACLs = 1;\r
-       \r
-       node.Flags = 0;\r
-       if(Entry->attrib & ATTR_DIRECTORY)      node.Flags |= VFS_FFLAG_DIRECTORY;\r
-       if(Entry->attrib & ATTR_READONLY) {\r
-               node.Flags |= VFS_FFLAG_READONLY;\r
-               node.ACLs = &gVFS_ACL_EveryoneRX;       // R-XR-XR-X\r
-       }\r
-       else {\r
-               node.ACLs = &gVFS_ACL_EveryoneRWX;      // RWXRWXRWX\r
-       }\r
-       \r
-       // Create timestamps\r
-       node.ATime = timestamp(0,0,0,\r
-                       ((Entry->adate&0x1F) - 1),      // Days\r
-                       ((Entry->adate&0x1E0) - 1),     // Months\r
-                       1980+((Entry->adate&0xFF00)>>8) // Years\r
-                       );\r
-       \r
-       node.CTime = Entry->ctimems * 10;       // Miliseconds\r
-       node.CTime += timestamp(\r
-                       ((Entry->ctime&0x1F)<<1),       // Seconds\r
-                       ((Entry->ctime&0x3F0)>>5),      // Minutes\r
-                       ((Entry->ctime&0xF800)>>11),    // Hours\r
-                       ((Entry->cdate&0x1F)-1),                // Days\r
-                       ((Entry->cdate&0x1E0)-1),               // Months\r
-                       1980+((Entry->cdate&0xFF00)>>8) // Years\r
-                       );\r
-                       \r
-       node.MTime = timestamp(\r
-                       ((Entry->mtime&0x1F)<<1),       // Seconds\r
-                       ((Entry->mtime&0x3F0)>>5),      // Minutes\r
-                       ((Entry->mtime&0xF800)>>11),    // Hours\r
-                       ((Entry->mdate&0x1F)-1),                // Days\r
-                       ((Entry->mdate&0x1E0)-1),               // Months\r
-                       1980+((Entry->mdate&0xFF00)>>8) // Years\r
-                       );\r
-       \r
-       // Set pointers\r
-       if(node.Flags & VFS_FFLAG_DIRECTORY) {\r
-               //Log_Debug("FAT", "Directory %08x has size 0x%x", node.Inode, node.Size);\r
-               node.Type = &gFAT_DirType;      \r
-               node.Size = -1;\r
-       }\r
-       else {\r
-               node.Type = &gFAT_FileType;\r
-       }\r
-       \r
-       ret = Inode_CacheNode(disk->inodeHandle, &node);\r
-       LEAVE('p', ret);\r
-       return ret;\r
-}\r
-\r
-/* \r
- * ====================\r
- *     Directory IO\r
- * ====================\r
- */\r
-\r
-/**\r
- * \brief Reads a sector from the disk\r
- * \param Node Directory node to read\r
- * \param Sector       Sector number in the directory to read\r
- * \param Buffer       Destination buffer for the read data\r
- */\r
-int FAT_int_ReadDirSector(tVFS_Node *Node, int Sector, fat_filetable *Buffer)\r
-{\r
-       Uint64  addr;\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       \r
-       ENTER("pNode iSector pEntry", Node, Sector, Buffer);\r
-       \r
-       // Parse address\r
-       if(FAT_int_GetAddress(Node, Sector * 512, &addr, NULL))\r
-       {\r
-               LEAVE('i', 1);\r
-               return 1;\r
-       }\r
-       \r
-       LOG("addr = 0x%llx", addr);\r
-       // Read Sector\r
-       if(VFS_ReadAt(disk->fileHandle, addr, 512, Buffer) != 512)\r
-       {\r
-               LEAVE('i', 1);\r
-               return 1;\r
-       }\r
-       \r
-       LEAVE('i', 0);\r
-       return 0;\r
-}\r
-\r
-#if SUPPORT_WRITE\r
-/**\r
- * \brief Writes an entry to the disk\r
- * \todo Support expanding a directory\r
- * \param Node Directory node\r
- * \param ID   ID of entry to update\r
- * \param Entry        Entry data\r
- * \return Zero on success, non-zero on error\r
- */\r
-int FAT_int_WriteDirEntry(tVFS_Node *Node, int ID, fat_filetable *Entry)\r
-{\r
-       Uint64  addr = 0;\r
-        int    tmp;\r
-       Uint32  cluster = 0;\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       \r
-       ENTER("pNode iID pEntry", Node, ID, Entry);\r
-       \r
-       tmp = FAT_int_GetAddress(Node, ID * sizeof(fat_filetable), &addr, &cluster);\r
-       if( tmp )\r
-       {\r
-               //TODO: Allocate a cluster\r
-               cluster = FAT_int_AllocateCluster(Node->ImplPtr, cluster);\r
-               if(cluster == -1) {\r
-                       Log_Warning("FAT", "Unable to allocate an other cluster for %p", Node);\r
-                       LEAVE('i', 1);\r
-                       return 1;\r
-               }\r
-               FAT_int_GetAddress(Node, ID * sizeof(fat_filetable), &addr, &cluster);\r
-       }\r
-       \r
-\r
-       LOG("addr = 0x%llx", addr);\r
-       \r
-       // Read Sector\r
-       VFS_WriteAt(disk->fileHandle, addr, sizeof(fat_filetable), Entry);      // Read Dir Data\r
-       \r
-       LEAVE('i', 0);\r
-       return 0;\r
-}\r
-#endif\r
-\r
-#if USE_LFN    \r
-/**\r
- * \fn char *FAT_int_GetLFN(tVFS_Node *node)\r
- * \brief Return pointer to LFN cache entry\r
- * \param Node Directory node\r
- * \param ID   ID of the short name\r
- * \return Pointer to the LFN cache entry\r
- */\r
-char *FAT_int_GetLFN(tVFS_Node *Node, int ID)\r
-{\r
-       tFAT_LFNCache   *cache;\r
-        int    i, firstFree;\r
-       \r
-       Mutex_Acquire( &Node->Lock );\r
-       \r
-       // TODO: Thread Safety (Lock things)\r
-       cache = Node->Data;\r
-       \r
-       // Create a cache if it isn't there\r
-       if(!cache) {\r
-               cache = Node->Data = malloc( sizeof(tFAT_LFNCache) + sizeof(tFAT_LFNCacheEnt) );\r
-               cache->NumEntries = 1;\r
-               cache->Entries[0].ID = ID;\r
-               cache->Entries[0].Data[0] = '\0';\r
-               Mutex_Release( &Node->Lock );\r
-               //Log_Debug("FAT", "Return = %p (new)", cache->Entries[0].Data);\r
-               return cache->Entries[0].Data;\r
-       }\r
-       \r
-       // Scan for this entry\r
-       firstFree = -1;\r
-       for( i = 0; i < cache->NumEntries; i++ )\r
-       {\r
-               if( cache->Entries[i].ID == ID ) {\r
-                       Mutex_Release( &Node->Lock );\r
-                       //Log_Debug("FAT", "Return = %p (match)", cache->Entries[i].Data);\r
-                       return cache->Entries[i].Data;\r
-               }\r
-               if( cache->Entries[i].ID == -1 && firstFree == -1 )\r
-                       firstFree = i;\r
-       }\r
-       \r
-       if(firstFree == -1) {\r
-               // Use `i` for temp length\r
-               i = sizeof(tFAT_LFNCache) + (cache->NumEntries+1)*sizeof(tFAT_LFNCacheEnt);\r
-               Node->Data = realloc( Node->Data, i );\r
-               if( !Node->Data ) {\r
-                       Log_Error("FAT", "realloc() fail, unable to allocate %i for LFN cache", i);\r
-                       Mutex_Release( &Node->Lock );\r
-                       return NULL;\r
-               }\r
-               //Log_Debug("FAT", "Realloc (%i)\n", i);\r
-               cache = Node->Data;\r
-               i = cache->NumEntries;\r
-               cache->NumEntries ++;\r
-       }\r
-       else {\r
-               i = firstFree;\r
-       }\r
-       \r
-       // Create new entry\r
-       cache->Entries[ i ].ID = ID;\r
-       cache->Entries[ i ].Data[0] = '\0';\r
-       \r
-       Mutex_Release( &Node->Lock );\r
-       //Log_Debug("FAT", "Return = %p (firstFree, i = %i)", cache->Entries[i].Data, i);\r
-       return cache->Entries[ i ].Data;\r
-}\r
-\r
-/**\r
- * \fn void FAT_int_DelLFN(tVFS_Node *node)\r
- * \brief Delete a LFN cache entry\r
- * \param Node Directory node\r
- * \param ID   File Entry ID\r
- */\r
-void FAT_int_DelLFN(tVFS_Node *Node, int ID)\r
-{\r
-       tFAT_LFNCache   *cache = Node->Data;\r
-        int    i;\r
-       \r
-       // Fast return\r
-       if(!cache)      return;\r
-       \r
-       // Scan for a current entry\r
-       for( i = 0; i < cache->NumEntries; i++ )\r
-       {\r
-               if( cache->Entries[i].ID == ID )\r
-                       cache->Entries[i].ID = -1;\r
-       }\r
-       return ;\r
-}\r
-#endif\r
-\r
-/**\r
- * \fn char *FAT_ReadDir(tVFS_Node *Node, int ID)\r
- * \param Node Node structure of directory\r
- * \param ID   Directory position\r
- * \return Filename as a heap string, NULL or VFS_SKIP\r
- */\r
-char *FAT_ReadDir(tVFS_Node *Node, int ID)\r
-{\r
-       fat_filetable   fileinfo[16];   // sizeof(fat_filetable)=32, so 16 per sector\r
-        int    a = 0;\r
-       char    *ret;\r
-       #if USE_LFN\r
-       char    *lfn = NULL;\r
-       #endif\r
-       \r
-       ENTER("pNode iID", Node, ID);\r
-       \r
-       if(FAT_int_ReadDirSector(Node, ID/16, fileinfo))\r
-       {\r
-               LOG("End of chain, end of dir");\r
-               LEAVE('n');\r
-               return NULL;\r
-       }\r
-       \r
-       // Offset in sector\r
-       a = ID % 16;\r
-\r
-       LOG("fileinfo[%i].name[0] = 0x%x", a, (Uint8)fileinfo[a].name[0]);\r
-       \r
-       // Check if this is the last entry\r
-       if( fileinfo[a].name[0] == '\0' ) {\r
-               Node->Size = ID;\r
-               LOG("End of list");\r
-               LEAVE('n');\r
-               return NULL;    // break\r
-       }\r
-       \r
-       // Check for empty entry\r
-       if( (Uint8)fileinfo[a].name[0] == 0xE5 ) {\r
-               LOG("Empty Entry");\r
-               #if 0   // Stop on empty entry?\r
-               LEAVE('n');\r
-               return NULL;    // Stop\r
-               #else\r
-               LEAVE('p', VFS_SKIP);\r
-               return VFS_SKIP;        // Skip\r
-               #endif\r
-       }\r
-       \r
-       #if USE_LFN\r
-       // Get Long File Name Cache\r
-       if(fileinfo[a].attrib == ATTR_LFN)\r
-       {\r
-               fat_longfilename        *lfnInfo;\r
-               \r
-               lfnInfo = (fat_longfilename *) &fileinfo[a];\r
-               \r
-               // Get cache for corresponding file\r
-               // > ID + Index gets the corresponding short node\r
-               lfn = FAT_int_GetLFN( Node, ID + (lfnInfo->id & 0x3F) );\r
-               \r
-               // Bit 6 indicates the start of an entry\r
-               if(lfnInfo->id & 0x40)  memset(lfn, 0, 256);\r
-               \r
-               a = ((lfnInfo->id & 0x3F) - 1) * 13;\r
-               //Log_Debug("FAT", "ID = 0x%02x, a = %i", lfnInfo->id, a);\r
-               \r
-               // Sanity Check (FAT implementations should not allow >255 character names)\r
-               if(a > 255)     return VFS_SKIP;\r
-               \r
-               // Append new bytes\r
-               lfn[a+ 0] = lfnInfo->name1[0];  lfn[a+ 1] = lfnInfo->name1[1];\r
-               lfn[a+ 2] = lfnInfo->name1[2];  lfn[a+ 3] = lfnInfo->name1[3];\r
-               lfn[a+ 4] = lfnInfo->name1[4];  \r
-               lfn[a+ 5] = lfnInfo->name2[0];  lfn[a+ 6] = lfnInfo->name2[1];\r
-               lfn[a+ 7] = lfnInfo->name2[2];  lfn[a+ 8] = lfnInfo->name2[3];\r
-               lfn[a+ 9] = lfnInfo->name2[4];  lfn[a+10] = lfnInfo->name2[5];\r
-               lfn[a+11] = lfnInfo->name3[0];  lfn[a+12] = lfnInfo->name3[1];\r
-               LOG("lfn = '%s'", lfn);\r
-               //Log_Debug("FAT", "lfn = '%s'", lfn);\r
-               LEAVE('p', VFS_SKIP);\r
-               return VFS_SKIP;\r
-       }\r
-       #endif\r
-       \r
-       // Check if it is a volume entry\r
-       if(fileinfo[a].attrib & 0x08) {\r
-               LEAVE('p', VFS_SKIP);\r
-               return VFS_SKIP;\r
-       }\r
-       // Ignore .\r
-       if(fileinfo[a].name[0] == '.' && fileinfo[a].name[1] == ' ') {\r
-               LEAVE('p', VFS_SKIP);\r
-               return VFS_SKIP;\r
-       }\r
-       // and ..\r
-       if(fileinfo[a].name[0] == '.' && fileinfo[a].name[1] == '.' && fileinfo[a].name[2] == ' ') {\r
-               LEAVE('p', VFS_SKIP);\r
-               return VFS_SKIP;\r
-       }\r
-       \r
-       LOG("name='%c%c%c%c%c%c%c%c.%c%c%c'",\r
-               fileinfo[a].name[0], fileinfo[a].name[1], fileinfo[a].name[2], fileinfo[a].name[3],\r
-               fileinfo[a].name[4], fileinfo[a].name[5], fileinfo[a].name[6], fileinfo[a].name[7],\r
-               fileinfo[a].name[8], fileinfo[a].name[9], fileinfo[a].name[10] );\r
-       \r
-       #if USE_LFN\r
-       lfn = FAT_int_GetLFN(Node, ID);\r
-       //Log_Debug("FAT", "lfn = %p'%s'", lfn, lfn);\r
-       ret = FAT_int_CreateName(&fileinfo[a], lfn);\r
-       #else\r
-       ret = FAT_int_CreateName(&fileinfo[a], NULL);\r
-       #endif\r
-       \r
-       LEAVE('s', ret);\r
-       return ret;\r
-}\r
-\r
-/**\r
- * \fn tVFS_Node *FAT_FindDir(tVFS_Node *node, char *name)\r
- * \brief Finds an entry in the current directory\r
- */\r
-tVFS_Node *FAT_FindDir(tVFS_Node *Node, const char *Name)\r
-{\r
-       fat_filetable   fileinfo[16];\r
-       char    tmpName[13];\r
-       #if USE_LFN\r
-       fat_longfilename        *lfnInfo;\r
-       char    lfn[256];\r
-        int    lfnPos=255, lfnId = -1;\r
-       #endif\r
-        int    i;\r
-       tVFS_Node       *tmpNode;\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       Uint32  cluster;\r
-       \r
-       ENTER("pNode sname", Node, Name);       \r
-\r
-       // Fast Returns\r
-       if(!Name || Name[0] == '\0') {\r
-               LEAVE('n');\r
-               return NULL;\r
-       }\r
-       \r
-       for( i = 0; ; i++ )\r
-       {\r
-               if((i & 0xF) == 0) {\r
-                       if(FAT_int_ReadDirSector(Node, i/16, fileinfo))\r
-                       {\r
-                               LEAVE('n');\r
-                               return NULL;\r
-                       }\r
-               }\r
-               \r
-               //Check if the files are free\r
-               if(fileinfo[i&0xF].name[0] == '\0')     break;  // End of List marker\r
-               if(fileinfo[i&0xF].name[0] == '\xE5')   continue;       // Free entry\r
-               \r
-               \r
-               #if USE_LFN\r
-               // Long File Name Entry\r
-               if(fileinfo[i & 0xF].attrib == ATTR_LFN)\r
-               {\r
-                       lfnInfo = (fat_longfilename *) &fileinfo[i&0xF];\r
-                       if(lfnInfo->id & 0x40) {\r
-                               memset(lfn, 0, 256);\r
-                               lfnPos = (lfnInfo->id & 0x3F) * 13 - 1;\r
-                       }\r
-                       // Sanity check the position so we don't overflow\r
-                       if( lfnPos < 12 )\r
-                               continue ;\r
-                       lfn[lfnPos--] = lfnInfo->name3[1];      lfn[lfnPos--] = lfnInfo->name3[0];\r
-                       lfn[lfnPos--] = lfnInfo->name2[5];      lfn[lfnPos--] = lfnInfo->name2[4];\r
-                       lfn[lfnPos--] = lfnInfo->name2[3];      lfn[lfnPos--] = lfnInfo->name2[2];\r
-                       lfn[lfnPos--] = lfnInfo->name2[1];      lfn[lfnPos--] = lfnInfo->name2[0];\r
-                       lfn[lfnPos--] = lfnInfo->name1[4];      lfn[lfnPos--] = lfnInfo->name1[3];\r
-                       lfn[lfnPos--] = lfnInfo->name1[2];      lfn[lfnPos--] = lfnInfo->name1[1];\r
-                       lfn[lfnPos--] = lfnInfo->name1[0];\r
-                       if((lfnInfo->id&0x3F) == 1)\r
-                       {\r
-                               lfnId = i+1;\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       // Remove LFN if it does not apply\r
-                       if(lfnId != i)  lfn[0] = '\0';\r
-               #else\r
-               if(fileinfo[i&0xF].attrib == ATTR_LFN)  continue;\r
-               #endif\r
-                       // Get Real Filename\r
-                       FAT_int_ProperFilename(tmpName, fileinfo[i&0xF].name);\r
-                       LOG("tmpName = '%s'", tmpName);\r
-               \r
-                       // Only the long name is case sensitive, 8.3 is not\r
-                       #if USE_LFN\r
-                       if(strucmp(tmpName, Name) == 0 || strcmp(lfn, Name) == 0)\r
-                       #else\r
-                       if(strucmp(tmpName, Name) == 0)\r
-                       #endif\r
-                       {\r
-                               cluster = fileinfo[i&0xF].cluster | (fileinfo[i&0xF].clusterHi << 16);\r
-                               tmpNode = Inode_GetCache(disk->inodeHandle, cluster);\r
-                               if(tmpNode == NULL)     // Node is not cached\r
-                               {\r
-                                       tmpNode = FAT_int_CreateNode(Node, &fileinfo[i&0xF], i);\r
-                               }\r
-                               LEAVE('p', tmpNode);\r
-                               return tmpNode;\r
-                       }\r
-               #if USE_LFN\r
-               }\r
-               #endif\r
-       }\r
-       \r
-       LEAVE('n');\r
-       return NULL;\r
-}\r
-\r
-tVFS_Node *FAT_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode)\r
-{\r
-       tFAT_VolInfo    *disk = Root->ImplPtr;\r
-        int    ents_per_sector = 512 / sizeof(fat_filetable); \r
-       fat_filetable   fileinfo[ents_per_sector];\r
-        int    sector = 0, i;\r
-       tVFS_Node       stub_node;\r
-\r
-       ENTER("pRoot XInode", Root, Inode);\r
-\r
-       stub_node.ImplPtr = disk;\r
-       stub_node.Size = -1;\r
-       stub_node.Inode = Inode >> 32;\r
-\r
-       for( i = 0; ; i ++ )\r
-       {\r
-               if( i == 0 || i == ents_per_sector )\r
-               {\r
-                       if(FAT_int_ReadDirSector(&stub_node, sector, fileinfo))\r
-                       {\r
-                               LOG("ReadDirSector failed");\r
-                               LEAVE('n');\r
-                               return NULL;\r
-                       }\r
-                       i = 0;\r
-                       sector ++;\r
-               }\r
-       \r
-               // Check for free/end of list\r
-               if(fileinfo[i].name[0] == '\0') break;  // End of List marker\r
-               if(fileinfo[i].name[0] == '\xE5')       continue;       // Free entry\r
-               \r
-               if(fileinfo[i].attrib == ATTR_LFN)      continue;\r
-\r
-               LOG("fileinfo[i].cluster = %x %04x", fileinfo[i].clusterHi, fileinfo[i].cluster);\r
-               #if DEBUG\r
-               {\r
-                       char    tmpName[13];\r
-                       FAT_int_ProperFilename(tmpName, fileinfo[i].name);\r
-                       LOG("tmpName = '%s'", tmpName);\r
-               }\r
-               #endif\r
-               \r
-       \r
-               if(fileinfo[i].cluster != (Inode & 0xFFFF))     continue;\r
-               if(fileinfo[i].clusterHi != ((Inode >> 16) & 0xFFFF))   continue;\r
-\r
-               LEAVE_RET('p', FAT_int_CreateNode(&stub_node, &fileinfo[i], sector*ents_per_sector+i));\r
-       }\r
-       LOG("sector = %i, i = %i", sector, i);\r
-       LEAVE('n');\r
-       return NULL;\r
-}\r
-\r
-#if SUPPORT_WRITE\r
-/**\r
- * \fn int FAT_Mknod(tVFS_Node *Node, char *Name, Uint Flags)\r
- * \brief Create a new node\r
- */\r
-int FAT_Mknod(tVFS_Node *Node, char *Name, Uint Flags)\r
-{\r
-       return 0;\r
-}\r
-\r
-/**\r
- * \fn int FAT_Relink(tVFS_Node *Node, char *OldName, char *NewName)\r
- * \brief Rename / Delete a file\r
- */\r
-int FAT_Relink(tVFS_Node *Node, char *OldName, char *NewName)\r
-{\r
-       tVFS_Node       *child;\r
-       fat_filetable   ft = {0};\r
-        int    ret;\r
-       \r
-       child = FAT_FindDir(Node, OldName);\r
-       if(!child)      return ENOTFOUND;\r
-       \r
-       // Delete?\r
-       if( NewName == NULL )\r
-       {\r
-               child->ImplInt |= FAT_FLAG_DELETE;      // Mark for deletion on close\r
-               \r
-               // Delete from the directory\r
-               ft.name[0] = '\xE9';\r
-               FAT_int_WriteDirEntry(Node, child->ImplInt & 0xFFFF, &ft);\r
-               \r
-               // Return success\r
-               ret = EOK;\r
-       }\r
-       // Rename\r
-       else\r
-       {\r
-               Log_Warning("FAT", "Renaming no yet supported %p ('%s' => '%s')",\r
-                       Node, OldName, NewName);\r
-               ret = ENOTIMPL;\r
-       }\r
-       \r
-       // Close child\r
-       child->Close( child );\r
-       return ret;\r
-}\r
-#endif\r
-\r
-/**\r
- * \fn void FAT_CloseFile(tVFS_Node *Node)\r
- * \brief Close an open file\r
- */\r
-void FAT_CloseFile(tVFS_Node *Node)\r
-{\r
-       tFAT_VolInfo    *disk = Node->ImplPtr;\r
-       if(Node == NULL)        return ;\r
-       \r
-       #if SUPPORT_WRITE\r
-       // Update the node if it's dirty (don't bother if it's marked for\r
-       // deletion)\r
-       if( (Node->ImplInt & FAT_FLAG_DIRTY) && !(Node->ImplInt & FAT_FLAG_DELETE) )\r
-       {\r
-               tFAT_VolInfo    buf[16];\r
-               tFAT_VolInfo    *ft = &buf[ (Node->ImplInt & 0xFFFF) % 16 ];\r
-               \r
-               FAT_int_ReadDirSector(Node, (Node->ImplInt & 0xFFFF)/16, buf);\r
-               ft->size = Node->Size;\r
-               // TODO: update adate, mtime, mdate\r
-               FAT_int_WriteDirEntry(Node, Node->ImplInt & 0xFFFF, ft);\r
-               \r
-               Node->ImplInt &= ~FAT_FLAG_DIRTY;\r
-       }\r
-       #endif\r
-       \r
-       // TODO: Make this more thread safe somehow, probably by moving the\r
-       // Inode_UncacheNode higher up and saving the cluster value somewhere\r
-       if( Node->ReferenceCount == 1 )\r
-       {               \r
-               #if SUPPORT_WRITE\r
-               // Delete File\r
-               if( Node->ImplInt & FAT_FLAG_DELETE ) {\r
-                       // Since the node is marked, we only need to remove it's data\r
-                       Uint32  cluster = Node->Inode & 0xFFFFFFFF;\r
-                       while( cluster != -1 )\r
-                               cluster = FAT_int_FreeCluster(Node->ImplPtr, cluster);\r
-               }\r
-               #endif\r
-       }\r
-       \r
-       Inode_UncacheNode(disk->inodeHandle, Node->Inode);\r
-       return ;\r
-}\r

UCC git Repository :: git.ucc.asn.au