X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FInput%2FMouse%2Fmain.c;h=8c27f132bc9263f758abb147555d492f014c4a53;hb=12c9ce3978373fcadb7015e75cce56f6e181488d;hp=56bf9b520f14fefce67de5385f967173dd3cce9a;hpb=11dbd684e9a3d907d43d71a3145205f1a86992fb;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Input/Mouse/main.c b/KernelLand/Modules/Input/Mouse/main.c
index 56bf9b52..8c27f132 100644
--- a/KernelLand/Modules/Input/Mouse/main.c
+++ b/KernelLand/Modules/Input/Mouse/main.c
@@ -17,10 +17,10 @@
  int	Mouse_Install(char **Arguments);
  int	Mouse_Cleanup(void);
 // - "User" side
-char	*Mouse_Root_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node	*Mouse_Root_FindDir(tVFS_Node *Node, const char *Name);
+ int	Mouse_Root_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]);
+tVFS_Node	*Mouse_Root_FindDir(tVFS_Node *Node, const char *Name, Uint Flags);
  int	Mouse_Dev_IOCtl(tVFS_Node *Node, int ID, void *Data);
-size_t	Mouse_Dev_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Data);
+size_t	Mouse_Dev_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Data, Uint Flags);
 // - Device Side
 tMouse	*Mouse_Register(const char *Name, int NumButtons, int NumAxies);
 void	Mouse_RemoveInstance(tMouse *Handle);
@@ -68,13 +68,15 @@ int Mouse_Cleanup(void)
 }
 
 // --- VFS Interface ---
-char *Mouse_Root_ReadDir(tVFS_Node *Node, int Pos)
+int Mouse_Root_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 {
-	if( Pos != 0 )	return NULL;
-	return strdup("system");
+	if( Pos != 0 )
+		return -EINVAL;
+	strcpy(Dest, "system");
+	return 0;
 }
 
-tVFS_Node *Mouse_Root_FindDir(tVFS_Node *Node, const char *Name)
+tVFS_Node *Mouse_Root_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 {
 	if( strcmp(Name, "system") != 0 )	return NULL;
 	return &gMouse_Pointer.Node;
@@ -117,7 +119,7 @@ int Mouse_Dev_IOCtl(tVFS_Node *Node, int ID, void *Data)
 /**
  * \brief Read from a device
  */
-size_t Mouse_Dev_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Data)
+size_t Mouse_Dev_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Data, Uint Flags)
 {
 	tPointer *ptr = Node->ImplPtr;
 	 int	n_buttons = ptr->FileHeader->NButtons;