X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Fvfs.h;h=cded047e771485c7ae85962a787bffe09aa25a85;hb=a2b49f92646ef666e17172faf72a9dcc0d18942a;hp=c2f2e35b3f4b8244a8d61e709f704c69b6f3e879;hpb=18a6f0a17a50c25007a8f9b910af02bdf6fbcb78;p=tpg%2Facess2.git diff --git a/Kernel/include/vfs.h b/Kernel/include/vfs.h index c2f2e35b..cded047e 100644 --- a/Kernel/include/vfs.h +++ b/Kernel/include/vfs.h @@ -21,6 +21,11 @@ #include +/** + * \brief Thread list datatype for VFS_Select + */ +typedef struct sVFS_SelectList tVFS_SelectList; + /** * \name tVFS_Node Flags * \brief Flag values for tVFS_Node.Flags @@ -127,7 +132,7 @@ typedef struct sVFS_Node */ /** - * \name Access controll + * \name Access control * \{ */ tUID UID; //!< ID of Owning User @@ -139,6 +144,20 @@ typedef struct sVFS_Node * \} */ + /** + * \name VFS_Select() fields + * \{ + */ + int DataAvaliable; + tVFS_SelectList *ReadThreads; //!< Threads waiting to read + int BufferFull; + tVFS_SelectList *WriteThreads; //!< Threads waiting to write + int ErrorOccurred; + tVFS_SelectList *ErrorThreads; //!< Threads waiting for an error + /** + * \} + */ + /** * \name Common Functions * \brief Functions that are used no matter the value of .Flags @@ -265,12 +284,12 @@ typedef struct sVFS_Node typedef struct sVFS_Driver { //! \brief Unique Identifier for this filesystem type - char *Name; + const char *Name; //! \brief Flags applying to this driver Uint Flags; //! \brief Callback to mount a device - tVFS_Node *(*InitDevice)(char *Device, char **Options); + tVFS_Node *(*InitDevice)(const char *Device, const char **Options); //! \brief Callback to unmount a device void (*Unmount)(tVFS_Node *Node); //! \brief Used internally (next driver in the chain) @@ -311,7 +330,21 @@ extern int VFS_AddDriver(tVFS_Driver *Info); * \brief Get the information structure of a driver given its name * \param Name Name of filesystem driver to find */ -extern tVFS_Driver *VFS_GetFSByName(char *Name); +extern tVFS_Driver *VFS_GetFSByName(const char *Name); + + +/** + * \brief Prepare a node for use + */ +extern void VFS_InitNode(tVFS_Node *Node); + +/** + * \brief Clean up a node, ready for deletion + * \note This should ALWAYS be called before a node is freed, as it + * cleans up VFS internal structures. + */ +extern void VFS_CleanupNode(tVFS_Node *Node); + /** * \fn tVFS_ACL *VFS_UnixToAcessACL(Uint Mode, Uint Owner, Uint Group) * \brief Transforms Unix Permssions into Acess ACLs @@ -322,6 +355,32 @@ extern tVFS_Driver *VFS_GetFSByName(char *Name); */ extern tVFS_ACL *VFS_UnixToAcessACL(Uint Mode, Uint Owner, Uint Group); +/** + */ +enum eVFS_SelectTypes +{ + VFS_SELECT_READ, + VFS_SELECT_WRITE, + VFS_SELECT_ERROR +}; + +/** + * \brief Wait for an event on a node + * \param Node Node to wait on + * \param Type Type of wait + * \param Timeout Time to wait (NULL for infinite wait) + * \param Name Name to show in debug output + * \return Number of nodes that actioned (0 or 1) + */ +extern int VFS_SelectNode(tVFS_Node *Node, enum eVFS_SelectTypes Type, tTime *Timeout, const char *Name); + +/** + * \brief Change the full flag on a node + */ +extern int VFS_MarkFull(tVFS_Node *Node, BOOL IsBufferFull); +extern int VFS_MarkAvaliable(tVFS_Node *Node, BOOL IsDataAvaliable); +extern int VFS_MarkError(tVFS_Node *Node, BOOL IsErrorState); + // --- Node Cache -- /** * \name Node Cache