aboutsummaryrefslogtreecommitdiff
path: root/kernel/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers')
-rw-r--r--kernel/drivers/interrupts.c4
-rw-r--r--kernel/drivers/keyboard.c3
-rw-r--r--kernel/drivers/mouse.c3
-rw-r--r--kernel/drivers/rtl8139.c3
4 files changed, 8 insertions, 5 deletions
diff --git a/kernel/drivers/interrupts.c b/kernel/drivers/interrupts.c
index d9d514c..268bff5 100644
--- a/kernel/drivers/interrupts.c
+++ b/kernel/drivers/interrupts.c
@@ -29,7 +29,7 @@ void idt_set_gate(u8 num, u32 base, u16 sel, u8 flags)
}
// Install IDT
-static void idt_install()
+static void idt_install(void)
{
// Set IDT pointer and limit
idt_ptr.limit = (sizeof(struct idt_entry) * 256) - 1;
@@ -60,7 +60,7 @@ void irq_uninstall_handler(int irq)
}
// Remap the IRQ table
-static void irq_remap()
+static void irq_remap(void)
{
outb(0x20, 0x11);
outb(0xA0, 0x11);
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index f7f9d2d..3ae3c0e 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -18,8 +18,9 @@ static u32 dev_id = 0;
static int state = 0;
static int merged = 0;
-static void keyboard_handler()
+static void keyboard_handler(struct regs *r)
{
+ UNUSED(r);
int scancode = inb(0x60);
// TODO: Support more than two-byte scancodes
diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c
index ce9d15c..40094d1 100644
--- a/kernel/drivers/mouse.c
+++ b/kernel/drivers/mouse.c
@@ -19,8 +19,9 @@ static u32 dev_id = 0;
static struct event_mouse *event = NULL;
-static void mouse_handler()
+static void mouse_handler(struct regs *r)
{
+ UNUSED(r);
switch (mouse_cycle) {
case 0:
mouse_byte[0] = (char)inb(0x60);
diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c
index 1f9eed9..753bd6a 100644
--- a/kernel/drivers/rtl8139.c
+++ b/kernel/drivers/rtl8139.c
@@ -82,8 +82,9 @@ static void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra)
}
}
-static void rtl8139_irq_handler()
+static void rtl8139_irq_handler(struct regs *r)
{
+ UNUSED(r);
u16 status = inw(rtl_iobase + RTL_PORT_ISR);
if (!status)
return;