System calls reorganized into the relevant source files.

include/console.h

@@ -54,4 +54,8 @@ void uart_transmit(char c);
 bool uart_can_receive(void);
 int uart_receive(void);
 
+/* system calls */
+int syscall_putch(int c);
+int syscall_getch(void);
+
 #endif

include/proc.h

@@ -88,4 +88,7 @@ void proc_shrink_memory(struct Process *proc, int page_count);
 bool proc_load(struct Process *proc, char **proc_image, int page_count);
 void proc_start(struct Process *proc);
 
+/* system calls */
+int syscall_exit(int arg1);
+
 #endif

kernel/console.c

@@ -54,6 +54,12 @@ void kputch(int c)
 	}
 }
 
+int syscall_putch(int c)
+{
+	kputch(c);
+	return 0;
+}
+
 /*
  * kgetch reads the next available character from receive_buffer. If the buffer
  * is empty, this function returns 0.
@@ -80,6 +86,11 @@ int kgetch(void)
 	return keycode;
 }
 
+int syscall_getch(void)
+{
+	return kgetch();
+}
+
 /*
  * uart_interrupt_handler reads a character from the uart0 serial port, and
  * puts it into receive_buffer. If the buffer is full, the character is ignored.

kernel/ksyscall.c

@@ -1,15 +1,6 @@
 #include <console.h>
-#include <klib.h>
-#include <ksyscall.h>
-#include <lib/string.h>
 #include <lib/syscall.h>
-#include <monitor.h>
 #include <proc.h>
-#include <system.h>
-
-static int syscall_exit(int arg1);
-static int syscall_putch(int arg1);
-static int syscall_getch(void);
 
 static int (*const syscall_handler[])() = {
 	[SYSCALL_EXIT] = syscall_exit,
@@ -22,31 +13,3 @@ int handle_syscall(enum SystemCallCode code, int arg1, int arg2, int arg3)
 {
 	return syscall_handler[code](arg1, arg2, arg3);
 }
-
-static int syscall_exit(int arg1)
-{
-	(void) arg1;
-	if (current_process == NULL)
-		return -1;
-
-	set_translation_table_base((uint32_t) V2P(kernel_vm));
-	proc_free(current_process);
-	current_process = NULL;
-
-	__asm__ volatile("ldr sp, =kernel_stack_start");
-	enable_interrupts();
-	monitor();
-
-	return 0;
-}
-
-static int syscall_putch(int arg1)
-{
-	kputch(arg1);
-	return 0;
-}
-
-static int syscall_getch(void)
-{
-	return kgetch();
-}

kernel/proc/build.mk

@@ -1,3 +1,4 @@
 PROC_DIR = kernel/proc
 
 OBJS += $(PROC_DIR)/proc.o
+OBJS += $(PROC_DIR)/syscall_exit.o

kernel/proc/syscall_exit.c

@@ -0,0 +1,22 @@
+#include <ksyscall.h>
+#include <proc.h>
+#include <monitor.h>
+#include <system.h>
+#include <vm.h>
+
+int syscall_exit(int arg1)
+{
+	(void) arg1;
+	if (current_process == NULL)
+		return -1;
+
+	set_translation_table_base((uint32_t) V2P(kernel_vm));
+	proc_free(current_process);
+	current_process = NULL;
+
+	__asm__ volatile("ldr sp, =kernel_stack_start");
+	enable_interrupts();
+	monitor();
+
+	return 0;	
+}