diff options
| author | Miguel <m.i@gmx.at> | 2018-08-19 21:14:01 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-08-19 21:14:01 +0200 |
| commit | 7dbbfea6ad0a458e1b1e2685a5dc947e0c43fdbf (patch) | |
| tree | 041d71e8d331ec557c0c296602f3f228d0a91c77 | |
| parent | 5055dc85c8a74fcd2ec24fbc51eba2a2da68debe (diff) | |
x86.s working
| -rw-r--r-- | asm/x86.s | 20 | ||||
| -rw-r--r-- | kernel/kernel.c | 2 | ||||
| -rw-r--r-- | lib/logger/log.c | 2 |
3 files changed, 12 insertions, 12 deletions
@@ -80,26 +80,26 @@ x86_xchg: x86_get_cr: mov 4(%esp), %ecx - cmp %ecx,0 + cmp $0,%ecx je get_cr0 - cmp %ecx,2 + cmp $2,%ecx je get_cr2 - cmp %ecx,3 + cmp $3,%ecx je get_cr3 - cmp %ecx,4 + cmp $4,%ecx je get_cr4 ret x86_set_cr: - mov 4(%esp), %eax - mov 8(%esp), %ecx - cmp %ecx,0 + mov 4(%esp), %ecx + mov 8(%esp), %eax + cmp $0,%ecx je set_cr0 - cmp %ecx,2 + cmp $2,%ecx je set_cr2 - cmp %ecx,3 + cmp $3,%ecx je set_cr3 - cmp %ecx,4 + cmp $4,%ecx je set_cr4 ret diff --git a/kernel/kernel.c b/kernel/kernel.c index b23a6d9..b3acc1d 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -41,7 +41,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) keyboard_init(sstdin); // MOUSE DRIVER - //mouse_init(sstdin); + mouse_init(); // GDT gdt_setup(); diff --git a/lib/logger/log.c b/lib/logger/log.c index d76174b..a5925e9 100644 --- a/lib/logger/log.c +++ b/lib/logger/log.c @@ -12,7 +12,7 @@ static void log_string(char *str) { - if(get_max_fd()>=2) syscall_write(2,str,strlen(str)); +// if(get_max_fd()>=2) syscall_write(2,str,strlen(str)); while(*str!=0) { |