aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/input/ps2/mouse.c
diff options
context:
space:
mode:
authorMarvin Borner2020-01-26 18:41:23 +0100
committerGitHub2020-01-26 18:41:23 +0100
commit43f501c74aa09f18c904ace902dc4cc5d241c218 (patch)
treeea30b53ac6043faddd1cdb2fdea17f37178b1cc7 /src/kernel/input/ps2/mouse.c
parentd5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (diff)
parentbb2a6b4d93512e8afc1b1999eb58f1f506cc27ae (diff)
Merged task-based userspace switching and updated heap/paging code
Awesome!
Diffstat (limited to 'src/kernel/input/ps2/mouse.c')
-rw-r--r--src/kernel/input/ps2/mouse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c
index 8b36ef9..c9fa94f 100644
--- a/src/kernel/input/ps2/mouse.c
+++ b/src/kernel/input/ps2/mouse.c
@@ -85,7 +85,7 @@ void mouse_install()
mouse_wait(1);
outb(0x64, 0x20);
mouse_wait(0);
- status = (inb(0x60) | 3);
+ status = (unsigned char) (inb(0x60) | 3);
mouse_wait(1);
outb(0x64, 0x60);
mouse_wait(1);
@@ -109,7 +109,7 @@ void mouse_install()
mouse_read();
mouse_write(0xF2);
mouse_read();
- status = mouse_read();
+ status = (unsigned char) mouse_read();
if (status == 3) serial_printf("Scrollwheel support!");
// Activate 4th and 5th mouse buttons
@@ -130,7 +130,7 @@ void mouse_install()
mouse_read();
mouse_write(0xF2);
mouse_read();
- status = mouse_read();
+ status = (unsigned char) mouse_read();
if (status == 4) serial_printf("4th and 5th mouse button support!");
/* TODO: Fix mouse laggyness