switched to apic/ioapic finally

4 files changed, 38 insertions, 25 deletions

diff --git a/asm/asm_int.h b/asm/asm_int.h
index 5f32777..2940ab4 100644
--- a/asm/asm_int.h
+++ b/asm/asm_int.h
@@ -25,6 +25,10 @@ void int15();
 
 void int128(); // syscalls
 void int129(); // scheduler
+void int140(); // scheduler
+void int144(); // scheduler
+void int145(); // scheduler
+void int146(); // scheduler
 void int200(); // apic timer
 void int170(); // smp scheduler
 void int255(); // unhandled
diff --git a/asm/asm_int.s b/asm/asm_int.s
index 70993b4..ec81885 100644
--- a/asm/asm_int.s
+++ b/asm/asm_int.s
@@ -19,6 +19,10 @@
 .global int128
 .global int129
 .global int200
+.global int140
+.global int144
+.global int145
+.global int146
 .global int170
 .global int255
 
@@ -137,31 +141,6 @@
     jmp .
 .endm
 
-int0: intx ack1 $0 interrupt_handler
-int1: intx ack1 $1 interrupt_handler
-int2: intx ack1 $2 interrupt_handler
-int3: intx ack1 $3 interrupt_handler
-int4: intx ack1 $4 interrupt_handler
-int5: intx ack1 $5 interrupt_handler
-int6: intx ack1 $6 interrupt_handler
-int7: intx ack1 $7 interrupt_handler
-
-int8: intx ack2  $8 interrupt_handler
-int9: intx ack2  $9 interrupt_handler
-int10: intx ack2 $10 interrupt_handler
-int11: intx ack2 $11 interrupt_handler
-int12: intx ack2 $12 interrupt_handler
-int13: intx ack2 $13 interrupt_handler
-int14: intx ack2 $14 interrupt_handler
-int15: intx ack2 $15 interrupt_handler
-
-int128: intx ack0 $128 interrupt_handler
-int129: intx ack0 $129 interrupt_handler
-
-int255: intx ack0 $255 interrupt_handler
-int200: intx ack0 $200 interrupt_handler
-int170: intx ack0 $170 interrupt_handler
-
 exc0: excx $0 exception_handle
 exc1: excx $1 exception_handle
 exc2: excx $2 exception_handle
@@ -181,3 +160,33 @@ exc15: excx $15 exception_handle
 exc16: excx $16 exception_handle
 exc17: excx $17 exception_handle
 exc18: excx $18 exception_handle
+
+int0:  intx ack0  $0 interrupt_handler
+int1:  intx ack0  $1 interrupt_handler
+int2:  intx ack0  $2 interrupt_handler
+int3:  intx ack0  $3 interrupt_handler
+int4:  intx ack0  $4 interrupt_handler
+int5:  intx ack0  $5 interrupt_handler
+int6:  intx ack0  $6 interrupt_handler
+int7:  intx ack0  $7 interrupt_handler
+int8:  intx ack0  $8 interrupt_handler
+int9:  intx ack0  $9 interrupt_handler
+int10: intx ack0 $10 interrupt_handler
+int11: intx ack0 $11 interrupt_handler
+int12: intx ack0 $12 interrupt_handler
+int13: intx ack0 $13 interrupt_handler
+int14: intx ack0 $14 interrupt_handler
+int15: intx ack0 $15 interrupt_handler
+
+int128: intx ack0 $128 interrupt_handler
+int129: intx ack0 $129 interrupt_handler
+
+int140: intx ack0 $140 interrupt_handler
+int144: intx ack0 $144 interrupt_handler
+int145: intx ack0 $145 interrupt_handler
+int146: intx ack0 $146 interrupt_handler
+
+int255: intx ack0 $255 interrupt_handler
+int200: intx ack0 $200 interrupt_handler
+int170: intx ack0 $170 interrupt_handler
+
diff --git a/asm/asm_mp.asm b/asm/asm_smp.asm
index 18b9d7e..18b9d7e 100644
--- a/asm/asm_mp.asm
+++ b/asm/asm_smp.asm
diff --git a/asm/asm_mp.h b/asm/asm_smp.h
index f36f4f7..f36f4f7 100644
--- a/asm/asm_mp.h
+++ b/asm/asm_smp.h