Simplify headers a bit

drivers/usb/usb.c

@@ -1,7 +1,6 @@
 #include "drivers/usb/device.h"
 #include "drivers/usb/driver.h"
 #include "drivers/usb/usb.h"
-#include "arch/amd64/cpu.h"
 #include "sys/thread.h"
 #include "sys/assert.h"
 #include "sys/sched.h"

fs/sysfs.c

@@ -1,6 +1,5 @@
 #include "user/fcntl.h"
 #include "user/errno.h"
-#include "arch/amd64/cpu.h"
 #include "arch/amd64/mm/phys.h"
 #include "arch/amd64/mm/pool.h"
 #include "fs/sysfs.h"

fs/vfs.c

@@ -1,6 +1,6 @@
-#include "arch/amd64/cpu.h"
 #include "user/fcntl.h"
 #include "user/errno.h"
+#include "sys/thread.h"
 #include "sys/block/blk.h"
 #include "fs/node.h"
 #include "sys/heap.h"

include/sys/thread.h

@@ -1,6 +1,7 @@
 #pragma once
 #if defined(ARCH_AMD64)
 #include "arch/amd64/asm/asm_thread.h"
+#include "arch/amd64/cpu.h"
 #endif
 #include "user/signum.h"
 #include "sys/wait.h"
@@ -118,8 +119,6 @@ int process_init_thread(struct process *proc, uintptr_t entry, void *arg, int us
 
 struct thread *process_first_thread(struct process *proc);
 
-//pid_t thread_alloc_pid(int is_user);
-//void thread_ioctx_fork(struct thread *dst, struct thread *src);
 #define THR_INIT_USER           (1 << 0)
 #define THR_INIT_STACK_SET      (1 << 1)
 int thread_init(struct thread *thr, uintptr_t entry, void *arg, int flags);
@@ -141,3 +140,5 @@ int thread_sleep(struct thread *thr, uint64_t deadline, uint64_t *int_time);
 
 void process_signal(struct process *proc, int signum);
 void thread_signal(struct thread *thr, int signum);
+
+struct process *task_start(void *entry, void *arg, int flags);

net/unix.c

@@ -1,4 +1,3 @@
-#include "arch/amd64/cpu.h"
 #include "sys/char/ring.h"
 #include "user/socket.h"
 #include "user/errno.h"

sys/char/chr.c

@@ -1,5 +1,4 @@
 #include "user/errno.h"
-#include "arch/amd64/cpu.h"
 #include "sys/char/chr.h"
 #include "sys/assert.h"
 #include "sys/string.h"

sys/char/line.c

@@ -1,14 +1,14 @@
-#include "arch/amd64/cpu.h"
 #include "sys/char/ring.h"
 #include "sys/char/line.h"
 #include "sys/char/chr.h"
 #include "sys/char/tty.h"
+#include "sys/thread.h"
 #include "sys/assert.h"
 #include "sys/ctype.h"
 #include "sys/debug.h"
 
 ssize_t line_read(struct chrdev *chr, void *buf, size_t pos, size_t lim) {
-    struct thread *thr = get_cpu()->thread;
+    struct thread *thr = thread_self;
     _assert(chr->type == CHRDEV_TTY);
     struct ring *r = &chr->buffer;
 

sys/char/pipe.c

@@ -1,6 +1,6 @@
-#include "arch/amd64/cpu.h"
 #include "sys/char/pipe.h"
 #include "sys/char/ring.h"
+#include "sys/thread.h"
 #include "user/errno.h"
 #include "sys/assert.h"
 #include "sys/debug.h"

sys/char/tty.c

@@ -1,13 +1,9 @@
-#include "arch/amd64/hw/rs232.h"
-#include "arch/amd64/hw/con.h"
-#include "arch/amd64/hw/ps2.h"
 #include "user/termios.h"
 #include "user/signum.h"
 #include "sys/char/input.h"
 #include "user/errno.h"
 #include "sys/char/line.h"
 #include "sys/char/ring.h"
-#include "arch/amd64/cpu.h"
 #include "sys/char/tty.h"
 #include "sys/char/chr.h"
 #include "sys/console.h"

sys/display.c

@@ -1,5 +1,4 @@
 #include "sys/mem/vmalloc.h"
-#include "arch/amd64/cpu.h"
 #include "sys/mem/phys.h"
 #include "sys/font/psf.h"
 #include "sys/display.h"

sys/execve.c

@@ -2,7 +2,6 @@
 #include "arch/amd64/context.h"
 #include "arch/amd64/mm/map.h"
 #include "sys/mem/vmalloc.h"
-#include "arch/amd64/cpu.h"
 #include "sys/binfmt_elf.h"
 #include "sys/sys_proc.h"
 #include "sys/mem/phys.h"

sys/init.c

@@ -1,6 +1,5 @@
 #include "user/fcntl.h"
 #include "user/errno.h"
-#include "arch/amd64/cpu.h"
 #include "sys/sys_proc.h"
 #include "fs/ofile.h"
 #include "sys/thread.h"

sys/mem/shmem.c

@@ -1,5 +1,4 @@
 #include "sys/mem/vmalloc.h"
-#include "arch/amd64/cpu.h"
 #include "sys/mem/shmem.h"
 #include "sys/block/blk.h"
 #include "sys/mem/phys.h"

sys/mod.c

@@ -1,4 +1,3 @@
-#include "arch/amd64/cpu.h"
 #include "fs/ofile.h"
 #include "fs/sysfs.h"
 #include "fs/vfs.h"

sys/panic.c

@@ -2,7 +2,6 @@
 #include "arch/amd64/smp/ipi.h"
 #include "arch/amd64/smp/smp.h"
 #endif
-#include "arch/amd64/cpu.h"
 #include "sys/thread.h"
 #include "sys/sched.h"
 #include "sys/panic.h"

sys/sys_file.c

@@ -1,7 +1,6 @@
 #include <config.h>
 #include "user/errno.h"
 #include "arch/amd64/hw/timer.h"
-#include "arch/amd64/cpu.h"
 #include "fs/ofile.h"
 #include "user/fcntl.h"
 #include "sys/char/ring.h"

sys/sys_net.c

@@ -1,4 +1,3 @@
-#include "arch/amd64/cpu.h"
 #include "sys/sys_net.h"
 #include "sys/assert.h"
 #include "sys/thread.h"

sys/sys_sys.c

@@ -2,7 +2,6 @@
 #include "user/reboot.h"
 #include "user/errno.h"
 #include "user/time.h"
-#include "arch/amd64/cpu.h"
 #include "sys/sys_sys.h"
 #include "sys/block/blk.h"
 #include "fs/node.h"

sys/thread.c

@@ -1,7 +1,6 @@
 #include "arch/amd64/mm/pool.h"
 #include "arch/amd64/context.h"
 #include "sys/mem/vmalloc.h"
-#include "arch/amd64/cpu.h"
 #include "sys/binfmt_elf.h"
 #include "sys/sys_proc.h"
 #include "sys/mem/phys.h"
@@ -291,6 +290,22 @@ void process_free(struct process *proc) {
     kfree(proc);
 }
 
+struct process *task_start(void *entry, void *arg, int flags) {
+    struct process *proc = kmalloc(sizeof(struct process));
+    if (!proc) {
+        return NULL;
+    }
+
+    if (process_init_thread(proc, (uintptr_t) entry, arg, 0) != 0) {
+        kfree(proc);
+        return NULL;
+    }
+
+    sched_queue(process_first_thread(proc));
+
+    return proc;
+}
+
 int process_init_thread(struct process *proc, uintptr_t entry, void *arg, int user) {
     list_head_init(&proc->g_link);
     list_head_init(&proc->shm_list);

sys/wait.c

@@ -1,5 +1,4 @@
 #include "arch/amd64/hw/timer.h"
-#include "arch/amd64/cpu.h"
 #include "user/errno.h"
 #include "sys/thread.h"
 #include "sys/assert.h"