diff options
Diffstat (limited to 'kernel/src/cpu')
| -rw-r--r-- | kernel/src/cpu/gdt.c | 10 | ||||
| -rw-r--r-- | kernel/src/cpu/idt.c | 4 | ||||
| -rw-r--r-- | kernel/src/cpu/pic.c | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/kernel/src/cpu/gdt.c b/kernel/src/cpu/gdt.c index 7460474..43ca332 100644 --- a/kernel/src/cpu/gdt.c +++ b/kernel/src/cpu/gdt.c @@ -29,7 +29,7 @@ void add_gdt_tss(uint32_t num, uint64_t offset, uint32_t limit, uint8_t access, void reload_gdt() { __asm__ __volatile__( - // reload segment registers + /* reload segment registers */ "mov $0x10, %ax;" "mov %ax, %ds;" "mov %ax, %es;" @@ -50,10 +50,10 @@ void init_gdt() gdt_pointer.size = sizeof(gdt) - 1; add_gdt_entry(0, 0, 0, 0, 0); - add_gdt_entry(1, 0, 0xfffff, 0x9a, 0xa); // code ring0 - add_gdt_entry(2, 0, 0xfffff, 0x92, 0xc); // data ring0 - add_gdt_entry(3, 0, 0xfffff, 0xf2, 0xc); // data ring3 - add_gdt_entry(4, 0, 0xfffff, 0xfa, 0xa); // code ring3 + add_gdt_entry(1, 0, 0xfffff, 0x9a, 0xa); /* code ring0 */ + add_gdt_entry(2, 0, 0xfffff, 0x92, 0xc); /* data ring0 */ + add_gdt_entry(3, 0, 0xfffff, 0xf2, 0xc); /* data ring3 */ + add_gdt_entry(4, 0, 0xfffff, 0xfa, 0xa); /* code ring3 */ add_gdt_tss(5, (uint64_t)&tss, sizeof(tss_type), 0x89, 0); load_gdt(&gdt_pointer); diff --git a/kernel/src/cpu/idt.c b/kernel/src/cpu/idt.c index 9134d84..bc3e143 100644 --- a/kernel/src/cpu/idt.c +++ b/kernel/src/cpu/idt.c @@ -33,7 +33,7 @@ void add_to_idt(uint16_t num, uint64_t offset, uint16_t selector, uint8_t type) void init_idt_table(void) { - // exceptions + /* exceptions */ add_to_idt(0, (uint64_t)isr0, GDT_CODE_SEG, TRAP_GATE); add_to_idt(1, (uint64_t)isr1, GDT_CODE_SEG, TRAP_GATE); add_to_idt(2, (uint64_t)isr2, GDT_CODE_SEG, TRAP_GATE); @@ -67,7 +67,7 @@ void init_idt_table(void) add_to_idt(30, (uint64_t)isr30, GDT_CODE_SEG, TRAP_GATE); add_to_idt(31, (uint64_t)isr31, GDT_CODE_SEG, TRAP_GATE); - // interrupts + /* interrupts */ add_to_idt(32, (uint64_t)irq0, GDT_CODE_SEG, INTERRUPT_GATE); add_to_idt(33, (uint64_t)irq1, GDT_CODE_SEG, INTERRUPT_GATE); for (size_t i = 34; i < 256; i++) { diff --git a/kernel/src/cpu/pic.c b/kernel/src/cpu/pic.c index cfcc4d5..222fc0f 100644 --- a/kernel/src/cpu/pic.c +++ b/kernel/src/cpu/pic.c @@ -3,20 +3,20 @@ void remap_pic(void) { - // starts the initialization sequence (in cascade mode) + /* starts the initialization sequence (in cascade mode) */ outb(PIC1_COMMAND, ICW1_INIT | ICW1_ICW4); outb(PIC2_COMMAND, ICW1_INIT | ICW1_ICW4); - outb(PIC1_DATA, 0xe0); // ICW2: Master PIC vector offset - outb(PIC2_DATA, 0xe8); // ICW2: Slave PIC vector offset + outb(PIC1_DATA, 0xe0); /* ICW2: Master PIC vector offset */ + outb(PIC2_DATA, 0xe8); /* ICW2: Slave PIC vector offset */ outb(PIC1_DATA, - 4); // ICW3: tell Master PIC that there is a slave PIC at IRQ2 (0000 0100) + 4); /* ICW3: tell Master PIC that there is a slave PIC at IRQ2 (0000 0100) */ outb(PIC2_DATA, - 2); // ICW3: tell Slave PIC its cascade identity (0000 0010) + 2); /* ICW3: tell Slave PIC its cascade identity (0000 0010) */ outb(PIC1_DATA, ICW4_8086); outb(PIC2_DATA, ICW4_8086); - // mask all interrupts + /* mask all interrupts */ outb(PIC1_DATA, 0xff); outb(PIC2_DATA, 0xff); } |