From d94ffac4a584dc7a4f6f2ec567b8caab05ce9253 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 6 May 2020 19:04:05 +0200
Subject: New build parameters and shared includes

This changes many files but I've just applied some replace commands.. So
- nothing special!
---
 src/kernel/syscall/actions/sys_exec.c    |  4 ++--
 src/kernel/syscall/actions/sys_exit.c    |  4 ++--
 src/kernel/syscall/actions/sys_fork.c    | 12 ++++++------
 src/kernel/syscall/actions/sys_free.c    |  4 ++--
 src/kernel/syscall/actions/sys_get_pid.c |  4 ++--
 src/kernel/syscall/actions/sys_malloc.c  |  6 +++---
 src/kernel/syscall/actions/sys_read.c    |  4 ++--
 src/kernel/syscall/actions/sys_write.c   |  4 ++--
 8 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/kernel/syscall/actions')

diff --git a/src/kernel/syscall/actions/sys_exec.c b/src/kernel/syscall/actions/sys_exec.c
index 000d185..049d085 100644
--- a/src/kernel/syscall/actions/sys_exec.c
+++ b/src/kernel/syscall/actions/sys_exec.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/tasks/process.h>
+#include <tasks/process.h>
 
-uint32_t sys_exec(char *path)
+u32 sys_exec(char *path)
 {
 	return uexec(path);
 }
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_exit.c b/src/kernel/syscall/actions/sys_exit.c
index e2761fd..98e0c34 100644
--- a/src/kernel/syscall/actions/sys_exit.c
+++ b/src/kernel/syscall/actions/sys_exit.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/tasks/process.h>
+#include <tasks/process.h>
 
-uint32_t sys_exit(uint32_t code)
+u32 sys_exit(u32 code)
 {
 	current_proc->state = PROC_ASLEEP;
 	return code;
diff --git a/src/kernel/syscall/actions/sys_fork.c b/src/kernel/syscall/actions/sys_fork.c
index 5e2ee80..f0a5711 100644
--- a/src/kernel/syscall/actions/sys_fork.c
+++ b/src/kernel/syscall/actions/sys_fork.c
@@ -1,11 +1,11 @@
 #include <stdint.h>
-#include <kernel/interrupts/interrupts.h>
-#include <kernel/memory/paging.h>
-#include <kernel/tasks/process.h>
-#include <kernel/lib/lib.h>
-#include <kernel/system.h>
+#include <interrupts/interrupts.h>
+#include <memory/paging.h>
+#include <tasks/process.h>
+#include <lib/lib.h>
+#include <system.h>
 
-uint32_t sys_fork(struct regs *r)
+u32 sys_fork(struct regs *r)
 {
 	struct page_directory *dir = paging_copy_user_directory(current_proc->cr3);
 	struct process *proc = process_make_new();
diff --git a/src/kernel/syscall/actions/sys_free.c b/src/kernel/syscall/actions/sys_free.c
index 480cd53..a7daf2f 100644
--- a/src/kernel/syscall/actions/sys_free.c
+++ b/src/kernel/syscall/actions/sys_free.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/memory/alloc.h>
+#include <memory/alloc.h>
 
-uint32_t sys_free(uint32_t ptr)
+u32 sys_free(u32 ptr)
 {
 	ufree((void *)ptr);
 	return 0;
diff --git a/src/kernel/syscall/actions/sys_get_pid.c b/src/kernel/syscall/actions/sys_get_pid.c
index 7631230..1184ce7 100644
--- a/src/kernel/syscall/actions/sys_get_pid.c
+++ b/src/kernel/syscall/actions/sys_get_pid.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/tasks/process.h>
+#include <tasks/process.h>
 
-uint32_t sys_get_pid()
+u32 sys_get_pid()
 {
 	return current_proc->pid;
 }
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_malloc.c b/src/kernel/syscall/actions/sys_malloc.c
index 8adc362..da21a2d 100644
--- a/src/kernel/syscall/actions/sys_malloc.c
+++ b/src/kernel/syscall/actions/sys_malloc.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/memory/alloc.h>
+#include <memory/alloc.h>
 
-uint32_t sys_malloc(uint32_t count)
+u32 sys_malloc(u32 count)
 {
-	return (uint32_t)umalloc(count);
+	return (u32)umalloc(count);
 }
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_read.c b/src/kernel/syscall/actions/sys_read.c
index 492e5fd..8b16064 100644
--- a/src/kernel/syscall/actions/sys_read.c
+++ b/src/kernel/syscall/actions/sys_read.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/fs/fs.h>
+#include <fs/fs.h>
 
-uint32_t sys_read(char *path, uint32_t offset, uint32_t count, uint8_t *buf)
+u32 sys_read(char *path, u32 offset, u32 count, u8 *buf)
 {
 	return read(path, offset, count, buf);
 }
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c
index b9b30f3..4d4275a 100644
--- a/src/kernel/syscall/actions/sys_write.c
+++ b/src/kernel/syscall/actions/sys_write.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/fs/fs.h>
+#include <fs/fs.h>
 
-uint32_t sys_write(char *path, uint32_t offset, uint32_t count, uint8_t *buf)
+u32 sys_write(char *path, u32 offset, u32 count, u8 *buf)
 {
 	return write(path, offset, count, buf);
 }
\ No newline at end of file
-- 
cgit v1.2.3