X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fsyscalls.c;h=d2f91858a6d2f91c02491f6af2ef6c49e9d7108f;hb=48f6d3ace33f15e2c46fb4c7a79f1f647e446e33;hp=4416ec4fed0e2f384f2e11f4dabb0c78deb941bf;hpb=b60e6b273c3ecb1614d937bf9448033e9d339e83;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/syscalls.c b/KernelLand/Kernel/syscalls.c
index 4416ec4f..d2f91858 100644
--- a/KernelLand/Kernel/syscalls.c
+++ b/KernelLand/Kernel/syscalls.c
@@ -44,7 +44,7 @@ extern Uint	Binary_Load(const char *file, Uint *entryPoint);
 void	SyscallHandler(tSyscallRegs *Regs);
  int	Syscall_ValidString(const char *Addr);
  int	Syscall_Valid(int Size, const void *Addr);
- int	Syscall_MM_SetFlags(const void *Addr, Uint Flags, Uint Mask);
+ int	Syscall_MM_SetFlags(void *Addr, Uint Flags, Uint Mask);
 
 // === CODE ===
 // TODO: Do sanity checking on arguments, ATM the user can really fuck with the kernel
@@ -72,6 +72,10 @@ void SyscallHandler(tSyscallRegs *Regs)
 	
 	// -- Put the current thread to sleep
 	case SYS_SLEEP:	Threads_Sleep();	break;
+
+	case SYS_TIMEDSLEEP:
+		Time_Delay(Regs->Arg1);
+		break;
 	
 	// -- Yield current timeslice
 	case SYS_YIELD:	Threads_Yield();	break;
@@ -113,13 +117,13 @@ void SyscallHandler(tSyscallRegs *Regs)
 		break;
 	
 	// -- Map an address
-	case SYS_MAP:	MM_Map(Regs->Arg1, Regs->Arg2);	break;
+	case SYS_MAP:	MM_Map((void*)Regs->Arg1, Regs->Arg2);	break;
 	
 	// -- Allocate an address
-	case SYS_ALLOCATE:	ret = MM_Allocate(Regs->Arg1);	break;
+	case SYS_ALLOCATE:	ret = MM_Allocate((void*)Regs->Arg1);	break;
 	
 	// -- Unmap an address
-	case SYS_UNMAP:		MM_Deallocate(Regs->Arg1);	break;
+	case SYS_UNMAP:		MM_Deallocate((void*)Regs->Arg1);	break;
 	
 	// -- Change the protection on an address
 	case SYS_SETFLAGS:
@@ -199,7 +203,20 @@ void SyscallHandler(tSyscallRegs *Regs)
 		// Path, *Entrypoint
 		ret = Binary_Load((char*)Regs->Arg1, (Uint*)Regs->Arg2);
 		break;
-	
+
+	// -- Load a kernel module
+	case SYS_LOADMOD:
+		CHECK_STR_NONULL( (const char *)Regs->Arg1 );
+		if( Threads_GetUID() != 0 ) {
+			MERR("Not root");
+			ret = EACCES;
+		}
+		else {
+			LOG("Module_LoadFile(\"%s\", NULL)", (const char *)Regs->Arg1);
+			ret = Module_LoadFile( (const char *)Regs->Arg1, NULL );
+		}
+		break;
+
 	// ---
 	// Virtual Filesystem
 	// ---
@@ -208,6 +225,11 @@ void SyscallHandler(tSyscallRegs *Regs)
 		LOG("VFS_Open(\"%s\", 0x%x)", (char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
 		ret = VFS_Open((char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
 		break;
+	case SYS_REOPEN:
+		CHECK_STR_NONULL( (char*)Regs->Arg2 );
+		LOG("VFS_Reopen(%i, \"%s\", 0x%x)", Regs->Arg1, (char*)Regs->Arg2, Regs->Arg3 | VFS_OPENFLAG_USER);
+		ret = VFS_Reopen(Regs->Arg1, (char*)Regs->Arg2, Regs->Arg3 | VFS_OPENFLAG_USER);
+		break;
 	
 	case SYS_CLOSE:
 		LOG("VFS_Close(%i)", Regs->Arg1);
@@ -218,7 +240,12 @@ void SyscallHandler(tSyscallRegs *Regs)
 		LOG("VFS_DuplicateFD(%i,%i)", Regs->Arg1, Regs->Arg2);
 		ret = VFS_DuplicateFD(Regs->Arg1, Regs->Arg2);
 		break;
-	
+
+	case SYS_FDCTL:
+		LOG("VFS_SetFDFlags(%i,0%o,0%o)", Regs->Arg1, Regs->Arg2, Regs->Arg3);
+		ret = VFS_SetFDFlags(Regs->Arg1, Regs->Arg2, Regs->Arg3);
+		break;
+
 	case SYS_SEEK:
 		#if BITS == 64
 		ret = VFS_Seek( Regs->Arg1, Regs->Arg2, Regs->Arg3 );
@@ -305,14 +332,10 @@ void SyscallHandler(tSyscallRegs *Regs)
 		else
 		{
 			// Sanity check the paths
-			if(!Syscall_ValidString((char*)Regs->Arg1)
-			|| !Syscall_ValidString((char*)Regs->Arg2)
-			|| (Regs->Arg3 && !Syscall_ValidString((char*)Regs->Arg3))
-			|| !Syscall_ValidString((char*)Regs->Arg4) ) {
-				err = -EINVAL;
-				ret = -1;
-				break;
-			}
+			CHECK_STR_NONULL((char*)Regs->Arg1);
+			CHECK_STR_NONULL((char*)Regs->Arg2);
+			CHECK_STR_NULLOK((char*)Regs->Arg3);
+			CHECK_STR_NONULL((char*)Regs->Arg4);
 			ret = VFS_Mount(
 				(char*)Regs->Arg1,	// Device
 				(char*)Regs->Arg2,	// Mount point
@@ -345,7 +368,17 @@ void SyscallHandler(tSyscallRegs *Regs)
 			0	// User handles
 			);
 		break;
+
+	
+	// Create a directory
+	case SYS_MKDIR:
+		CHECK_STR_NONULL( (char*)Regs->Arg1 );
+		ret = VFS_MkDir( (char*)Regs->Arg1 );
+		break;
 	
+	case SYS_UNLINK:
+		Log_Error("Syscalls", "TODO: Impliment SYS_UNLINK");
+		// Fall
 	// -- Debug
 	//#if DEBUG_BUILD
 	case SYS_DEBUG:
@@ -421,7 +454,7 @@ int Syscall_Valid(int Size, const void *Addr)
 	return CheckMem( Addr, Size );
 }
 
-int Syscall_MM_SetFlags(const void *Addr, Uint Flags, Uint Mask)
+int Syscall_MM_SetFlags(void *Addr, Uint Flags, Uint Mask)
 {
 	tPAddr	paddr = MM_GetPhysAddr(Addr);
 	Flags &= MM_PFLAG_RO|MM_PFLAG_EXEC;
@@ -438,6 +471,6 @@ int Syscall_MM_SetFlags(const void *Addr, Uint Flags, Uint Mask)
 			Mask |= MM_PFLAG_COW;
 		}
 	}
-	MM_SetFlags((tVAddr)Addr, Flags, Mask);
+	MM_SetFlags(Addr, Flags, Mask);
 	return 0;
 }