From 26add4c1119947113ff94a8603863ab72eb0aad0 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sat, 19 Oct 2013 19:12:34 +0200
Subject: [PATCH] Update sortix/kernel.cpp to current coding conventions.

---
 sortix/kernel.cpp | 112 ++++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/sortix/kernel.cpp b/sortix/kernel.cpp
index 0934a5af..29f1edc7 100644
--- a/sortix/kernel.cpp
+++ b/sortix/kernel.cpp
@@ -23,73 +23,77 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/log.h>
-#include <sortix/kernel/panic.h>
-#include <sortix/kernel/video.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/textbuffer.h>
-#include <sortix/kernel/pci.h>
-#include <sortix/kernel/worker.h>
-#include <sortix/kernel/memorymanagement.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/copy.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/vnode.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/dtable.h>
-#include <sortix/kernel/mtable.h>
-#include <sortix/kernel/keyboard.h>
-#include <sortix/kernel/syscall.h>
-#include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/time.h>
-#include <sortix/kernel/scheduler.h>
-#include <sortix/kernel/fcache.h>
-#include <sortix/kernel/string.h>
-#include <sortix/kernel/user-timer.h>
-#include <sortix/kernel/signal.h>
-#include <sortix/kernel/symbol.h>
-#include <sortix/kernel/process.h>
-#include <sortix/kernel/thread.h>
-
-#include <sortix/fcntl.h>
-#include <sortix/stat.h>
-#include <sortix/mman.h>
-#include <sortix/wait.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <malloc.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <sortix/fcntl.h>
+#include <sortix/mman.h>
+#include <sortix/stat.h>
+#include <sortix/wait.h>
+
+#include <sortix/kernel/copy.h>
+#include <sortix/kernel/decl.h>
+#include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/dtable.h>
+#include <sortix/kernel/fcache.h>
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/keyboard.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/log.h>
+#include <sortix/kernel/memorymanagement.h>
+#include <sortix/kernel/mtable.h>
+#include <sortix/kernel/panic.h>
+#include <sortix/kernel/pci.h>
+#include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/signal.h>
+#include <sortix/kernel/string.h>
+#include <sortix/kernel/symbol.h>
+#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/textbuffer.h>
+#include <sortix/kernel/thread.h>
+#include <sortix/kernel/time.h>
+#include <sortix/kernel/user-timer.h>
+#include <sortix/kernel/video.h>
+#include <sortix/kernel/vnode.h>
+#include <sortix/kernel/worker.h>
 
-#include "kernelinfo.h"
-#include "x86-family/cmos.h"
-#include "x86-family/gdt.h"
-#include "x86-family/float.h"
-#include "multiboot.h"
 #include "alarm.h"
 #include "ata.h"
+#include "bga.h"
 #include "com.h"
-#include "uart.h"
+#include "dispmsg.h"
+#include "elf.h"
+#include "fs/kram.h"
+#include "fs/user.h"
+#include "identity.h"
+#include "initrd.h"
+#include "io.h"
+#include "kb/layout/us.h"
+#include "kb/ps2.h"
+#include "kernelinfo.h"
 #include "logterminal.h"
-#include "vgatextbuffer.h"
+#include "multiboot.h"
+#include "net/fs.h"
+#include "pipe.h"
+#include "poll.h"
 #include "resource.h"
 #include "serialterminal.h"
 #include "textterminal.h"
-#include "elf.h"
-#include "identity.h"
-#include "initrd.h"
+#include "uart.h"
 #include "vga.h"
-#include "bga.h"
-#include "io.h"
-#include "pipe.h"
-#include "poll.h"
-#include "dispmsg.h"
-#include "fs/kram.h"
-#include "fs/user.h"
-#include "kb/ps2.h"
-#include "kb/layout/us.h"
-#include "net/fs.h"
+#include "vgatextbuffer.h"
+#include "x86-family/cmos.h"
+#include "x86-family/float.h"
+#include "x86-family/gdt.h"
 
 // Keep the stack size aligned with $CPU/base.s
 const size_t STACK_SIZE = 64*1024;