3 files changed, 42 insertions, 5 deletions
diff --git a/kernel/include/comus/memory.h b/kernel/include/comus/memory.h
index 3b57324..d91c9bb 100644
--- a/kernel/include/comus/memory.h
+++ b/kernel/include/comus/memory.h
@@ -97,11 +97,11 @@ mem_ctx_t mem_ctx_clone(mem_ctx_t ctx, bool cow);
 void mem_ctx_free(mem_ctx_t ctx);
 
 /**
- * Free a memory context
+ * Switch into a different memory context
  *
- * @param ctx - pointer to the memory context
+ * @param ctx - the memory context
  */
-void free_mem_ctx(mem_ctx_t ctx);
+void mem_ctx_switch(mem_ctx_t ctx);
 
 /**
  * Allocates at least len bytes of memory starting at
diff --git a/kernel/include/comus/procs.h b/kernel/include/comus/procs.h
index fe8cbee..2c40f5a 100644
--- a/kernel/include/comus/procs.h
+++ b/kernel/include/comus/procs.h
@@ -237,7 +237,7 @@ struct pcb *pcb_queue_peek(const pcb_queue_t queue);
  * @param pcb[out]       Pointer to where the PCB pointer will be saved
  * @return status of the removal request
  */
-int pcb_queue_remove(pcb_queue_t queue, struct pcb **pcb);
+int pcb_queue_pop(pcb_queue_t queue, struct pcb **pcb);
 
 /**
  * Remove the specified PCB from the indicated queue.
@@ -246,7 +246,7 @@ int pcb_queue_remove(pcb_queue_t queue, struct pcb **pcb);
  * @param pcb[in]        Pointer to the PCB to be removed
  * @return status of the removal request
  */
-int pcb_queue_remove_this(pcb_queue_t queue, struct pcb *pcb);
+int pcb_queue_remove(pcb_queue_t queue, struct pcb *pcb);
 
 /**
  * Schedule the supplied process
diff --git a/kernel/include/comus/syscalls.h b/kernel/include/comus/syscalls.h
new file mode 100644
index 0000000..3dc128d
--- /dev/null
+++ b/kernel/include/comus/syscalls.h
@@ -0,0 +1,37 @@
+/**
+ * @file syscalls.h
+ *
+ * @author Freya Murphy <freya@freyacat.org>
+ * @author cisi 452
+ *
+ * System call declarations
+ */
+
+#ifndef SYSCALLS_H_
+#define SYSCALLS_H_
+
+#define SYS_exit 0
+#define SYS_waitpid 1
+#define SYS_fork 2
+#define SYS_exec 3
+#define SYS_open 4
+#define SYS_close 5
+#define SYS_read 6
+#define SYS_write 7
+#define SYS_getpid 8
+#define SYS_getppid 9
+#define SYS_gettime 10
+#define SYS_getprio 11
+#define SYS_setprio 12
+#define SYS_kill 13
+#define SYS_sleep 14
+#define SYS_brk 15
+#define SYS_sbrk 16
+
+// UPDATE THIS DEFINITION IF MORE SYSCALLS ARE ADDED!
+#define N_SYSCALLS 13
+
+// interrupt vector entry for system calls
+#define VEC_SYSCALL 0x80
+
+#endif /* syscalls.h */