Commit cbfd78d1 by malcolm

Fix up kbd stuff

parent 246a4b2b
Showing with 4 additions and 11 deletions
...@@ -57,11 +57,8 @@ void default_handler(struct reg_state reg, uint32_t interrupt, uint32_t error, s ...@@ -57,11 +57,8 @@ void default_handler(struct reg_state reg, uint32_t interrupt, uint32_t error, s
serial_writestring("int caught "); serial_writestring("int caught ");
char f[20]; char f[20];
serial_val(interrupt); serial_val(interrupt);
serial_val(error); serial_hexword(error);serial_writestring(" ");
serial_val(stack.eip); serial_hexword(stack.eip);serial_writestring(" ");
//serial_hexword(error);serial_writestring(" ");
//serial_hexword(stack.eip);serial_writestring(" ");
//serial_val(stack.eip);
serial_val(stack.cd); serial_val(stack.cd);
serial_val(stack.eflags); serial_val(stack.eflags);
serial_writestring("\n"); serial_writestring("\n");
......
...@@ -4,13 +4,9 @@ ...@@ -4,13 +4,9 @@
#include "idt.h" #include "idt.h"
#include "string.h" #include "string.h"
#define serial_val(i) itoa(i,f);serial_writestring(f);serial_writestring(" ");
void kbd_irq() void kbd_irq()
{ {
char f[20]; serial_hexword(inb(0x60));
//serial_hexword(inb(0x60));
serial_val(inb(0x60));
serial_writestring("\n"); serial_writestring("\n");
pic_command(0, PIC_OCW2_EOI); pic_command(0, PIC_OCW2_EOI);
} }
......
...@@ -48,7 +48,7 @@ void populate_page_table(page_table_entry* table, void* start, int num, int offs ...@@ -48,7 +48,7 @@ void populate_page_table(page_table_entry* table, void* start, int num, int offs
// TODO: put this as a label at the end of the code, so we can take // TODO: put this as a label at the end of the code, so we can take
// its address // its address
#define KERN_END 0x104000 #define KERN_END 0x204000
page_directory_entry* mem_init_kern_tables(multiboot_memory_map* mmap, multiboot_memory_map* mmap_end) page_directory_entry* mem_init_kern_tables(multiboot_memory_map* mmap, multiboot_memory_map* mmap_end)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment