Refactor kernel interrupt API.

sortix/com.cpp

@@ -29,9 +29,12 @@
 #include <sortix/kernel/inode.h>
 #include <sortix/kernel/descriptor.h>
 #include <sortix/kernel/interlock.h>
+#include <sortix/kernel/interrupt.h>
+
 #include <sortix/stat.h>
+
 #include <errno.h>
-#include "interrupt.h"
+
 #include "thread.h"
 #include "signal.h"
 #include "com.h"

sortix/include/sortix/kernel/interrupt.h

@@ -22,12 +22,17 @@
 
 *******************************************************************************/
 
-#ifndef SORTIX_INTERRUPT_H
-#define SORTIX_INTERRUPT_H
+#ifndef INCLUDE_SORTIX_KERNEL_INTERRUPT_H
+#define INCLUDE_SORTIX_KERNEL_INTERRUPT_H
 
-#include "cpu.h"
+#include <sortix/kernel/decl.h>
 
 namespace Sortix {
+
+namespace CPU {
+struct InterruptRegisters;
+} // namespace CPU
+
 namespace Interrupt {
 
 const unsigned IRQ0 = 32;

sortix/interrupt.cpp

@@ -24,13 +24,13 @@
 
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/interrupt.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 #include "x86-family/idt.h"
-#include "interrupt.h"
 #include "scheduler.h"
 #include "signal.h"
 #include "process.h"

sortix/kb/ps2.cpp

@@ -24,10 +24,14 @@
 
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/keyboard.h>
+#include <sortix/kernel/interrupt.h>
+
 #include <sortix/keycodes.h>
+
 #include <assert.h>
 #include <string.h>
-#include "../interrupt.h"
+
+#include "../cpu.h"
 #include "ps2.h"
 
 namespace Sortix

sortix/kernel.cpp

@@ -42,6 +42,7 @@
 #include <sortix/kernel/mtable.h>
 #include <sortix/kernel/keyboard.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/interrupt.h>
 
 #include <sortix/fcntl.h>
 #include <sortix/stat.h>
@@ -75,7 +76,6 @@
 #include "sound.h"
 #include "io.h"
 #include "pipe.h"
-#include "interrupt.h"
 #include "poll.h"
 #include "dispmsg.h"
 #include "fs/kram.h"

sortix/panic.cpp

@@ -23,8 +23,8 @@
 *******************************************************************************/
 
 #include <sortix/kernel/platform.h>
+#include <sortix/kernel/interrupt.h>
 #include <string.h>
-#include "interrupt.h"
 #include <sortix/kernel/log.h>
 #include "calltrace.h"
 #include <sortix/kernel/panic.h>

sortix/scheduler.cpp

@@ -25,13 +25,13 @@
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/interrupt.h>
 
 #include <assert.h>
 #include <string.h>
 
 #include "x86-family/gdt.h"
 #include "x86-family/float.h"
-#include "interrupt.h"
 #include "time.h"
 #include "thread.h"
 #include "process.h"

sortix/signal.cpp

@@ -24,10 +24,13 @@
 
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/panic.h>
+#include <sortix/kernel/interrupt.h>
+
 #include <sortix/signal.h>
+
 #include <assert.h>
 #include <string.h>
-#include "interrupt.h"
+
 #include "thread.h"
 #include "signal.h"
 

sortix/thread.cpp

@@ -26,6 +26,7 @@
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/interrupt.h>
 
 #include <sortix/mman.h>
 #include <sortix/signal.h>
@@ -37,7 +38,6 @@
 #include "process.h"
 #include "thread.h"
 #include "scheduler.h"
-#include "interrupt.h"
 #include "time.h"
 
 namespace Sortix

sortix/time.cpp

@@ -25,9 +25,9 @@
 
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/interrupt.h>
 
 #include "time.h"
-#include "interrupt.h"
 #include "process.h"
 #include "scheduler.h"
 #include "sound.h"

sortix/x64/memorymanagement.cpp

@@ -24,10 +24,12 @@
 
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/memorymanagement.h>
+#include <sortix/kernel/interrupt.h>
+
 #include <string.h>
+
 #include "multiboot.h"
 #include "x86-family/memorymanagement.h"
-#include "interrupt.h"
 
 namespace Sortix
 {

sortix/x86-family/float.cpp

@@ -23,8 +23,10 @@
 *******************************************************************************/
 
 #include <sortix/kernel/platform.h>
+#include <sortix/kernel/interrupt.h>
+
 #include <assert.h>
-#include "../interrupt.h"
+
 #include "../thread.h"
 #include "float.h"