X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FStorage%2FFDDv2%2Fmain.c;h=7bea4769845949a1e5d0f5a6231d98b7a2ef7e98;hb=015f48988e0ff398409d71dfc692005ab439490a;hp=bb088da1689494c7ffb4662b04f8253bcd6cfbf4;hpb=4d184c30a3385600c0d87a2f93b4259c8c973e73;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/Storage/FDDv2/main.c b/KernelLand/Modules/Storage/FDDv2/main.c index bb088da1..7bea4769 100644 --- a/KernelLand/Modules/Storage/FDDv2/main.c +++ b/KernelLand/Modules/Storage/FDDv2/main.c @@ -22,9 +22,9 @@ int FDD_RegisterFS(void); // --- VFS int FDD_ReadDir(tVFS_Node *Node, int pos, char dest[FILENAME_MAX]); -tVFS_Node *FDD_FindDir(tVFS_Node *dirNode, const char *Name); +tVFS_Node *FDD_FindDir(tVFS_Node *dirNode, const char *Name, Uint Flags); int FDD_IOCtl(tVFS_Node *Node, int ID, void *Data); -size_t FDD_ReadFS(tVFS_Node *node, off_t Offset, size_t Len, void *buffer); +size_t FDD_ReadFS(tVFS_Node *node, off_t Offset, size_t Len, void *buffer, Uint Flags); // --- Helpers int FDD_int_ReadWriteWithinTrack(int Disk, int Track, int bWrite, size_t Offset, size_t Length, void *Buffer); @@ -129,7 +129,7 @@ int FDD_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]) * \param Name Drive name * \return Pointer to node structure */ -tVFS_Node *FDD_FindDir(tVFS_Node *Node, const char *Name) +tVFS_Node *FDD_FindDir(tVFS_Node *Node, const char *Name, Uint Flags) { int pos; if( '0' > Name[0] || Name[0] > '9' ) return NULL; @@ -169,7 +169,7 @@ int FDD_IOCtl(tVFS_Node *Node, int ID, void *Data) * \param Buffer Destination buffer * \return Number of bytes read */ -size_t FDD_ReadFS(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer) +size_t FDD_ReadFS(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags) { int disk = Node->Inode; int track; @@ -187,7 +187,9 @@ size_t FDD_ReadFS(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer) rem_len = Length; track = Offset / BYTES_PER_TRACK; - Offset %= BYTES_PER_TRACK; + Offset %= BYTES_PER_TRACK; + + // TODO: Handle (Flags & VFS_IOFLAG_NOBLOCK) if( Offset ) {