From ed84017353c6fc9421b223ff6ec62f8d881d8098 Mon Sep 17 00:00:00 2001 From: Aleksa Vučković Date: Mon, 17 Jan 2022 22:00:14 +0100 Subject: Fixing $(WARNING)s & explicitly declaring function prototypes --- src/c/idt.c | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) (limited to 'src/c/idt.c') diff --git a/src/c/idt.c b/src/c/idt.c index 843c9da..c27743f 100644 --- a/src/c/idt.c +++ b/src/c/idt.c @@ -1,54 +1,29 @@ +#include #include -#include +#include #include -#define INTERRUPT_GATE_32 0x8E - -#define KERNEL_CODE 0x08 -#define KERNEL_DATA 0x10 - -#define PIC1_COMMAND_PORT 0x20 -#define PIC1_DATA_PORT 0x21 -#define PIC2_COMMAND_PORT 0xA0 -#define PIC2_DATA_PORT 0xA1 - -struct idt_entry -{ - uint16_t offset1; - uint16_t selector; - uint8_t zero; - uint8_t type_attr; - uint16_t offset2; -} __attribute__((packed)); - -struct idt_pointer -{ - uint16_t size; - uint32_t offset; -} __attribute__((packed)); - extern void load_idt(struct idt_pointer *idtp); -extern void keyboard_irq(); struct idt_entry idt[256]; struct idt_pointer idtp; void init_idt_entry(size_t num, uint32_t offset, uint16_t selector, uint8_t type_attr) { - idt[num].offset1=(offset & 0xffff); + idt[num].offset1=(uint16_t)(offset & 0xffff); idt[num].selector=selector; idt[num].zero=0; idt[num].type_attr=type_attr; - idt[num].offset2=(offset & 0xffff0000)>>16; + idt[num].offset2=(uint16_t)((offset & 0xffff0000)>>16); } -void add_idt_entry(size_t num,uint32_t offset) +void add_idt_entry(size_t num, uint32_t offset) { init_idt_entry(num,offset,KERNEL_CODE,INTERRUPT_GATE_32); } -void init_pic() +void init_pic(void) { ioport_out(PIC1_COMMAND_PORT, 0x11); ioport_out(PIC2_COMMAND_PORT, 0x11); @@ -63,7 +38,7 @@ void init_pic() ioport_out(PIC1_DATA_PORT, 0xFC); } -void init_idt_table() +void init_idt_table(void) { init_pic(); add_idt_entry(0,(uint32_t)irq0); -- cgit v1.2.3