X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fmount.c;h=45591a46f6fd6048d97ba6a97fa5752eb2cb5bd9;hb=2e19f113bc68fd38f59d469b213d251ee50e314d;hp=6c0929e2b6b2f2b015fc93b3410f60e1f1f9bc41;hpb=1e7db40300bc594cf708bb6082a6e05a268da946;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/mount.c b/Kernel/vfs/mount.c
index 6c0929e2..45591a46 100644
--- a/Kernel/vfs/mount.c
+++ b/Kernel/vfs/mount.c
@@ -1,7 +1,7 @@
 /* 
  * Acess Micro - VFS Server version 1
  */
-#include <common.h>
+#include <acess.h>
 #include <vfs.h>
 #include <vfs_int.h>
 #include <fs_sysfs.h>
@@ -11,7 +11,7 @@ extern int	giVFS_MountFileID;
 extern char	*gsVFS_MountFile;
 
 // === PROTOTYPES ===
- int	VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *ArgString);
+ int	VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options);
 void	VFS_UpdateMountFile();
 
 // === GLOBALS ===
@@ -21,13 +21,16 @@ tVFS_Mount	*gVFS_RootMount = NULL;
 
 // === CODE ===
 /**
- * \fn int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
  * \brief Mount a device
  * \param Device	Device string to mount
  * \param MountPoint	Destination for the mount
  * \param Filesystem	Filesystem to use for the mount
  * \param Options		Options to be passed to the filesystem
  * \return -1 on Invalid FS, -2 on No Mem, 0 on success
+ * 
+ * Mounts the filesystem on \a Device at \a MountPoint using the driver
+ * \a Filesystem. The options in the string \a Options is passed to the
+ * driver's mount.
  */
 int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 {
@@ -40,7 +43,7 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 	// Get the filesystem
 	fs = VFS_GetFSByName(Filesystem);
 	if(!fs) {
-		Warning("VFS_Mount - Unknown FS Type '%s'", Filesystem);
+		Log_Warning("VFS", "VFS_Mount - Unknown FS Type '%s'", Filesystem);
 		return -1;
 	}
 	
@@ -93,7 +96,7 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 	}
 	RELEASE( &glVFS_MountList );
 	
-	Log("VFS_Mount: Mounted '%s' to '%s' ('%s')", Device, MountPoint, Filesystem);
+	Log_Log("VFS", "Mounted '%s' to '%s' ('%s')", Device, MountPoint, Filesystem);
 	
 	VFS_UpdateMountFile();
 	
@@ -101,8 +104,9 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 }
 
 /**
- * \fn void VFS_UpdateMountFile()
  * \brief Updates the mount file buffer
+ * 
+ * Updates the ProcFS mounts file buffer to match the current mounts list.
  */
 void VFS_UpdateMountFile()
 {