X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Fvfs_ext.h;h=d7d74c40372a4030ec2431d17157544361ea2d1f;hb=dd2491a82880ed9b01b5d66b1814d271921797a4;hp=4fe892331ab810dfcaa01be1fdbb6b7cf17c4e59;hpb=386adcea9ab9e3b30a83c57ea6cfffe011536891;p=tpg%2Facess2.git

diff --git a/Kernel/include/vfs_ext.h b/Kernel/include/vfs_ext.h
index 4fe89233..d7d74c40 100644
--- a/Kernel/include/vfs_ext.h
+++ b/Kernel/include/vfs_ext.h
@@ -6,6 +6,12 @@
 #ifndef _VFS_EXT_H
 #define _VFS_EXT_H
 
+//! Inode number type
+typedef Uint64	tInode;
+
+//! Mountpoint identifier type
+typedef Uint32	tMount;
+
 // === CONSTANTS ===
 //! Maximum size of a Memory Path generated by VFS_GetMemPath
 #define	VFS_MEMPATH_SIZE	(3 + (BITS/4)*2)
@@ -75,6 +81,29 @@ enum eVFS_SeekDirs
  * \}
  */
 
+/**
+ * \brief MMap protection flags
+ * \{
+ */
+#define MMAP_PROT_READ	0x001	//!< Readable memory
+#define MMAP_PROT_WRITE	0x002	//!< Writable memory
+#define MMAP_PROT_EXEC	0x004	//!< Executable memory
+/**
+ * \}
+ */
+
+/**
+ * \brief MMap mapping flags
+ * \{
+ */
+#define MMAP_MAP_SHARED 	0x001	//!< Shared with all other users of the FD
+#define MMAP_MAP_PRIVATE	0x002	//!< Local (COW) copy
+#define MMAP_MAP_FIXED  	0x004	//!< Load to a fixed address
+#define MMAP_MAP_ANONYMOUS	0x008	//!< Not associated with a FD
+/**
+ * \}
+ */
+
 // -- System Call Structures ---
 /**
  * \brief ACL Defintion Structure
@@ -89,34 +118,52 @@ typedef struct sVFS_ACL
 		unsigned Inv:	1;	//!< Invert Permissions
 		unsigned Perms:	31;	//!< Permission Flags
 	};
-}	tVFS_ACL;
+} tVFS_ACL;
 
 /**
  * \brief SYS_FINFO structure
  */
 typedef struct sFInfo
 {
-	Uint	uid;	//!< Owning User ID
-	Uint	gid;	//!< Owning Group ID
-	Uint	flags;	//!< File flags
+	tMount	mount;	//!< Mountpoint ID
+	tInode	inode;	//!< Inode
+	Uint32	uid;	//!< Owning User ID
+	Uint32	gid;	//!< Owning Group ID
+	Uint32	flags;	//!< File flags
 	Uint64	size;	//!< File Size
 	Sint64	atime;	//!< Last Accessed time
 	Sint64	mtime;	//!< Last modified time
 	Sint64	ctime;	//!< Creation time
-	 int	numacls;	//!< Total number of ACL entries
+	Sint32	numacls;	//!< Total number of ACL entries
 	tVFS_ACL	acls[];	//!< ACL buffer (size is passed in the \a MaxACLs argument to VFS_FInfo)
-}	tFInfo;
+} PACKED tFInfo;
 
 /**
  * \brief fd_set for select()
  */
 typedef struct
 {
+	//! Bitmap of set file descriptors
 	Uint16	flags[MAX_FILE_DESCS/16];
 }	fd_set;
 
+/**
+ * \brief Clear a descriptor flag in a fd_set
+ * \param fd	File descriptor to clear
+ * \param fdsetp	Set to modify
+ */
 #define FD_CLR(fd, fdsetp) ((fdsetp)->flags[(fd)/16]&=~(1<<((fd)%16)))
+/**
+ * \brief Set a descriptor flag in a fd_set
+ * \param fd	File descriptor to set
+ * \param fdsetp	Set to modify
+ */
 #define FD_SET(fd, fdsetp) ((fdsetp)->flags[(fd)/16]|=~(1<<((fd)%16)))
+/**
+ * \brief Test a descriptor flag in a fd_set
+ * \param fd	File descriptor to test
+ * \param fdsetp	Set to modify
+ */
 #define FD_ISSET(fd, fdsetp) ((fdsetp)->flags[(fd)/16]&(1<<((fd)%16)))
 
 // === FUNCTIONS ===
@@ -133,6 +180,24 @@ extern int	VFS_Init(void);
  * \return VFS Handle (an integer) or -1 if an error occured
  */
 extern int	VFS_Open(const char *Path, Uint Mode);
+/**
+ * \brief Opens a file via an open directory
+ * \note The file to open must be a direct child of the parent
+ * \param FD	Parent Directory
+ * \param Name	Child name
+ * \param Mode	Open mode
+ * \return File handle (same as returned from VFS_Open)
+ */
+extern int	VFS_OpenChild(int FD, const char *Name, Uint Mode);
+/**
+ * \brief Opens a file given a mount ID and an inode number
+ * \param Mount	Mount ID returned by FInfo
+ * \param Inode	Inode number from FInfo
+ * \param Mode	Open mode (see VFS_Open)
+ * \return File handle (same as VFS_Open)
+ */
+extern int	VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode);
+
 /**
  * \brief Close a currently open file
  * \param FD	Handle returned by ::VFS_Open
@@ -281,17 +346,6 @@ extern int	VFS_Symlink(const char *Name, const char *Link);
  * \return Boolean Success
  */
 extern int	VFS_ReadDir(int FD, char *Dest);
-/**
- * \brief Opens a file via an open directory
- * \note The file to open must be a direct child of the parent
- * \param Errno	Error number
- * \param FD	Parent Directory
- * \param Name	Child name
- * \param Mode	Open mode
- * \return File handle (same as returned from VFS_Open)
- */
-extern int	VFS_OpenChild(Uint *Errno, int FD, const char *Name, Uint Mode);
-
 /**
  * \brief Wait for an aciton on a file descriptor
  * \param MaxHandle	Maximum set handle in \a *Handles
@@ -306,7 +360,6 @@ extern int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles,
 
 /**
  * \brief Map a file into memory
- * \param ErrNo	Error status pointer
  * \param DestHint	Suggested place for read data
  * \param Length	Size of area to map
  * \param Protection	Protection type (see `man mmap`)
@@ -314,13 +367,12 @@ extern int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles,
  * \param FD	File descriptor to load from
  * \param Offset	Start of region
  */
-extern void	*VFS_MMap(int *ErrNo, void *DestHint, size_t Length, int Protection, int Flags, int FD, Uint64 Offset);
+extern void	*VFS_MMap(void *DestHint, size_t Length, int Protection, int Flags, int FD, Uint64 Offset);
 
 /**
  * \brief Unmap memory allocated by VFS_MMap
- * \param ErrNo	Error status pointer
  * \param Addr	Address of data to unmap
  * \param Length	Length of data
  */
-extern int	VFS_MUnmap(int *ErrNo, void *Addr, size_t Length);
+extern int	VFS_MUnmap(void *Addr, size_t Length);
 #endif