summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-09-09 11:54:38 +0200
committerMichal Idziorek <m.i@gmx.at>2014-09-09 11:54:38 +0200
commit03af1ac75d123b4d53300c0e34844c40bc475c95 (patch)
tree72a81a5a23442f865f4697428925a6e3478e6d62
parentc3b38e3665207d029f617fc67bc9d19142ce5cd7 (diff)
fixed mouse driver
-rw-r--r--Makefile2
-rw-r--r--kernel/kernel.c5
-rw-r--r--kernel/mouse.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 4e960d8..bb61873 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
############ some constants ############
-USB_STICK=/dev/sdf #take care!
+USB_STICK=/dev/sdd #take care!
#here our kernel will be loaded by the bootloader.
KERNEL_START=0x18000
diff --git a/kernel/kernel.c b/kernel/kernel.c
index a030f7b..8e8de0c 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -114,6 +114,10 @@ void kernel_main(uint32_t initial_stack, int mp)
//
timer_init();
+ // mouse driver init (before interrupts)
+ mouse_init();
+
+
//
// Setup Interrupts (code segment: 0x08)
//
@@ -187,7 +191,6 @@ void kernel_main(uint32_t initial_stack, int mp)
//
shell_init();
- mouse_init();
//
// Initialize Multitasking
diff --git a/kernel/mouse.c b/kernel/mouse.c
index d000b30..84b9c84 100644
--- a/kernel/mouse.c
+++ b/kernel/mouse.c
@@ -31,7 +31,7 @@ int8_t mouse_get_y()
void mouse_init()
{
mouse_x=mouse_y=0;
- mouse_cycle=1;
+ mouse_cycle=0;
uint8_t _status; //unsigned char