From e7648669694806b366824c0dc0c8b80c8d167d35 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Wed, 3 Sep 2014 23:21:33 +0200 Subject: debugging floppy driver :( --- kernel/kernel.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index a582563..85c3da1 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -11,7 +11,7 @@ // todo: move somewhere else!? void int_clock_handler(); void int_kb_handler(); -//void int_floppy_handler(); +void int_floppy_handler(); uint32_t read_eip(); uint32_t c1,c2,c3; @@ -53,6 +53,7 @@ void kernel_main(uint32_t initial_stack, int mp) // move the foolfont and aps code before it gets overwritten! uint8_t *source=0x16600; uint8_t *dest=0x80000; + for(int i=0;i<2*512;i++) { dest[i]=source[i]; @@ -133,7 +134,7 @@ void kernel_main(uint32_t initial_stack, int mp) int_install_ir(33, 0b10001110, 0x08,&int_kb_handler); // install floppy interrupt handler (irq 6 => 38) - //int_install_ir(38, 0b10001110, 0x08,&int_floppy_handler); + int_install_ir(38, 0b10001110, 0x08,&int_floppy_handler); // now we can enable interrupts back again x86_int_enable(); @@ -159,13 +160,13 @@ void kernel_main(uint32_t initial_stack, int mp) panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); // Start the other Processors (also before paging !) - smp_start_aps(&procdata); + // smp_start_aps(&procdata); ///////////////////// // paging (pass the vesa physbase address for identity mapping) - vmem_init(vesa_physbase); + //vmem_init(vesa_physbase); ////////////////////// @@ -176,13 +177,13 @@ void kernel_main(uint32_t initial_stack, int mp) // Its driver will be hopefully implemented one day ;) // - pci_init(); + //pci_init(); // // Initialize Floppy Disk // - //floppy_init(); + floppy_init(); // -- cgit v1.2.3