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/interrupts/isr.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/kernel/interrupts/isr.c')

diff --git a/src/kernel/interrupts/isr.c b/src/kernel/interrupts/isr.c
index 880c23a..54584b4 100644
--- a/src/kernel/interrupts/isr.c
+++ b/src/kernel/interrupts/isr.c
@@ -1,12 +1,12 @@
 #include <stdint.h>
-#include <kernel/interrupts/interrupts.h>
-#include <kernel/system.h>
-#include <kernel/lib/string.h>
-#include <kernel/lib/stdio.h>
-#include <kernel/lib/lib.h>
-#include <kernel/graphics/vesa.h>
-#include <kernel/tasks/process.h>
-#include <kernel/io/io.h>
+#include <interrupts/interrupts.h>
+#include <system.h>
+#include <lib/string.h>
+#include <lib/stdio.h>
+#include <lib/lib.h>
+#include <graphics/vesa.h>
+#include <tasks/process.h>
+#include <io/io.h>
 
 // Install ISRs in IDT
 void isrs_install()
@@ -55,13 +55,13 @@ void isrs_install()
 irq_handler_t isr_routines[256] = { 0 };
 
 // Install custom IRQ handler
-void isr_install_handler(size_t isr, irq_handler_t handler)
+void isr_install_handler(u32 isr, irq_handler_t handler)
 {
 	isr_routines[isr] = handler;
 }
 
 // Remove the custom IRQ handler
-void isr_uninstall_handler(size_t isr)
+void isr_uninstall_handler(u32 isr)
 {
 	isr_routines[isr] = 0;
 }
@@ -111,7 +111,7 @@ void fault_handler(struct regs *r)
 		handler(r);
 	} else {
 		cli();
-		uint32_t faulting_address;
+		u32 faulting_address;
 		asm("mov %%cr2, %0" : "=r"(faulting_address));
 
 		log("\n[DEBUG]\nEIP: 0x%x\nEAX: 0x%x\nEBX: 0x%x\nECX: 0x%x\nEDX: 0x%x\nESP: 0x%x\nFault addr: 0x%x\nErr flag: 0x%x\nErr code: 0x%x\nINT code: 0x%x\nINT msg: %s",
@@ -133,7 +133,7 @@ void fault_handler(struct regs *r)
 			scheduler(r);
 			sti();
 		} else {
-			if (faulting_address != (uint32_t)fb) {
+			if (faulting_address != (u32)fb) {
 				panic("Page fault before multitasking started!");
 			} else {
 				debug(RED "Fatal video error!" RES);
-- 
cgit v1.2.3