From f4cbcf4c06a683c75185c26a431ad016703db03f Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex.auvolat@ens.fr>
Date: Sun, 15 Feb 2015 10:15:47 +0100
Subject: Moving files.

---
 src/apps/init/main.c              |  2 --
 src/common/README                 |  4 ++--
 src/common/include/syscallid.h    | 40 ---------------------------------------
 src/common/include/syscallproto.h | 40 +++++++++++++++++++++++++++++++++++++++
 src/kernel/include/syscall.h      |  2 +-
 src/lib/include/syscall.h         |  2 +-
 6 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 src/common/include/syscallid.h
 create mode 100644 src/common/include/syscallproto.h

(limited to 'src')

diff --git a/src/apps/init/main.c b/src/apps/init/main.c
index f7259ff..0defd13 100644
--- a/src/apps/init/main.c
+++ b/src/apps/init/main.c
@@ -1,5 +1,3 @@
-#include <stdbool.h>
-
 #include <string.h>
 
 #include <syscall.h>
diff --git a/src/common/README b/src/common/README
index 7e3e1f7..14d1a2d 100644
--- a/src/common/README
+++ b/src/common/README
@@ -2,7 +2,7 @@ This directory contains the library functions common to userland
 and kernel code, for the three basic libraries of the system :
 
 - libkogata : memory allocation, system functions
-- libc : (partial)implementation of standard libc functions
+- libc : (partial) implementation of standard libc functions
 - libalgo : usefull data structures
 
 It relies on a few functions being exported :
@@ -16,7 +16,7 @@ It relies on a few functions being exported :
 
 These function are supposed to be defined in the code that calls
 the common functions. The headers for these functions are to be
-found in `assert.h` and `malloc.h`.
+found in `debug.h` and `malloc.h`.
 
 In kernel code, these functions are defined somewhere in the kernel.
 In user code, these functions are defined in the user part of libkogata.
diff --git a/src/common/include/syscallid.h b/src/common/include/syscallid.h
deleted file mode 100644
index bfcd37a..0000000
--- a/src/common/include/syscallid.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-
-#define SC_MAX		128		// maximum number of syscalls
-
-#define SC_DBG_PRINT	0
-#define SC_EXIT			1
-#define SC_YIELD		2
-
-#define	SC_MMAP			10
-#define SC_MMAP_FILE	11
-#define SC_MCHMAP		12
-#define SC_MUNMAP		13
-
-#define SC_CREATE		20
-#define SC_DELETE		21
-#define SC_MOVE			22
-#define SC_STAT			23
-#define SC_IOCTL		24
-
-#define SC_OPEN			30
-#define SC_CLOSE		31
-#define SC_READ			32
-#define SC_WRITE		33
-#define SC_READDIR		34
-#define SC_STAT_OPEN	35		// stat on open file handle
-#define SC_GET_MODE		36		// get mode for open file handle
-
-#define SC_MAKE_FS		40
-#define SC_FS_ADD_SRC	41
-#define SC_RM_FS		42
-
-#define SC_NEW_PROC		50
-#define SC_BIND_FS		51		// bind FS to children process
-#define SC_PROC_EXEC	52		// execute binary in process
-
-// much more to do
-
-
-/* vim: set ts=4 sw=4 tw=0 noet :*/
diff --git a/src/common/include/syscallproto.h b/src/common/include/syscallproto.h
new file mode 100644
index 0000000..bfcd37a
--- /dev/null
+++ b/src/common/include/syscallproto.h
@@ -0,0 +1,40 @@
+#pragma once
+
+
+#define SC_MAX		128		// maximum number of syscalls
+
+#define SC_DBG_PRINT	0
+#define SC_EXIT			1
+#define SC_YIELD		2
+
+#define	SC_MMAP			10
+#define SC_MMAP_FILE	11
+#define SC_MCHMAP		12
+#define SC_MUNMAP		13
+
+#define SC_CREATE		20
+#define SC_DELETE		21
+#define SC_MOVE			22
+#define SC_STAT			23
+#define SC_IOCTL		24
+
+#define SC_OPEN			30
+#define SC_CLOSE		31
+#define SC_READ			32
+#define SC_WRITE		33
+#define SC_READDIR		34
+#define SC_STAT_OPEN	35		// stat on open file handle
+#define SC_GET_MODE		36		// get mode for open file handle
+
+#define SC_MAKE_FS		40
+#define SC_FS_ADD_SRC	41
+#define SC_RM_FS		42
+
+#define SC_NEW_PROC		50
+#define SC_BIND_FS		51		// bind FS to children process
+#define SC_PROC_EXEC	52		// execute binary in process
+
+// much more to do
+
+
+/* vim: set ts=4 sw=4 tw=0 noet :*/
diff --git a/src/kernel/include/syscall.h b/src/kernel/include/syscall.h
index c6c0ed4..045205f 100644
--- a/src/kernel/include/syscall.h
+++ b/src/kernel/include/syscall.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <idt.h>
-#include <syscallid.h>
+#include <syscallproto.h>
 
 void setup_syscalls();
 
diff --git a/src/lib/include/syscall.h b/src/lib/include/syscall.h
index 37d7302..44b88cf 100644
--- a/src/lib/include/syscall.h
+++ b/src/lib/include/syscall.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <syscallid.h>
+#include <syscallproto.h>
 
 #include <fs.h>
 #include <debug.h>
-- 
cgit v1.2.3