some cleanup

15 files changed, 6 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 83b07d3..95be7eb 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,8 @@ run-bochs: all
 run-qemu: all
 	qemu-system-i386 $(FOOLOS)
 
+run: run-qemu
+
 newrun: clean run
 
 
diff --git a/kernel/acpi.c b/kernel/inactive/acpi.c
index b42f628..b42f628 100644
--- a/kernel/acpi.c
+++ b/kernel/inactive/acpi.c
diff --git a/kernel/acpi.h b/kernel/inactive/acpi.h
index b7c7342..b7c7342 100644
--- a/kernel/acpi.h
+++ b/kernel/inactive/acpi.h
diff --git a/kernel/e1000.c b/kernel/inactive/e1000.c
index 99194be..99194be 100644
--- a/kernel/e1000.c
+++ b/kernel/inactive/e1000.c
diff --git a/kernel/e1000.h b/kernel/inactive/e1000.h
index 5413fe1..5413fe1 100644
--- a/kernel/e1000.h
+++ b/kernel/inactive/e1000.h
diff --git a/kernel/floppy.c b/kernel/inactive/floppy.c
index 1dbe137..1dbe137 100644
--- a/kernel/floppy.c
+++ b/kernel/inactive/floppy.c
diff --git a/kernel/floppy.h b/kernel/inactive/floppy.h
index c149a3a..c149a3a 100644
--- a/kernel/floppy.h
+++ b/kernel/inactive/floppy.h
diff --git a/kernel/mouse.c b/kernel/inactive/mouse.c
index 910f0cf..910f0cf 100644
--- a/kernel/mouse.c
+++ b/kernel/inactive/mouse.c
diff --git a/kernel/mp.c b/kernel/inactive/mp.c
index 1f6c2e6..1f6c2e6 100644
--- a/kernel/mp.c
+++ b/kernel/inactive/mp.c
diff --git a/kernel/mp.h b/kernel/inactive/mp.h
index fc7f036..fc7f036 100644
--- a/kernel/mp.h
+++ b/kernel/inactive/mp.h
diff --git a/kernel/pci.c b/kernel/inactive/pci.c
index e5d9711..e5d9711 100644
--- a/kernel/pci.c
+++ b/kernel/inactive/pci.c
diff --git a/kernel/smp.c b/kernel/inactive/smp.c
index 63b4087..63b4087 100644
--- a/kernel/smp.c
+++ b/kernel/inactive/smp.c
diff --git a/kernel/smp.h b/kernel/inactive/smp.h
index 8737ffc..8737ffc 100644
--- a/kernel/smp.h
+++ b/kernel/inactive/smp.h
diff --git a/kernel/interrupts.c b/kernel/interrupts.c
index c63df72..ac200e5 100644
--- a/kernel/interrupts.c
+++ b/kernel/interrupts.c
@@ -11,7 +11,7 @@ void int_kb_handler();
 void int_syscall_handler();
 void int_install_ir(int irq, uint16_t flags, uint16_t sel, void *addr);
 void int_default_handler();
-void mouse_handler(); 
+//void mouse_handler(); 
 
 
 // the interrupt descriptor table
@@ -144,7 +144,7 @@ void int_init(uint16_t sel)
     #endif
     
     //mouse 
-    int_install_ir(44, 0b10001110, 0x08,&mouse_handler);
+//    int_install_ir(44, 0b10001110, 0x08,&mouse_handler);
 
     //system calls
     int_install_ir(0x80, 0b10001110, 0x08,&int_syscall_handler);
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 77970c3..0c14e56 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -4,25 +4,20 @@
 #error "Watchout! this is not Linux but FoolOS. Use a cross-compiler"
 #endif
 
-#include "config.h"
-
 #include <stdint.h>
 
-#include "asm/asm.h"
+#include "config.h"
+#include "asm/asm.h" // TODO: ?!?!
 
 #include "lib/logger/log.h"
-
 #include "lib/buffer/ringbuffer.h"
 
-#include "smp.h"
 #include "timer.h"
 #include "spinlock.h"
 #include "syscalls.h"
 #include "mem.h"
 #include "vmem.h"
 #include "interrupts.h"
-#include "acpi.h"
-#include "mp.h"
 #include "keyboard.h"
 #include "console.h"