diff --git a/kernel/dev/at/cga.inc b/kernel/dev/at/cga.inc index bbbbdfb..0665ea2 100644 --- a/kernel/dev/at/cga.inc +++ b/kernel/dev/at/cga.inc @@ -75,7 +75,11 @@ cga_putc: call cga_getpos mov [ebp-0x2], ax pop eax - + cmp al, CR + jne @f + leave + ret +@@: cmp al, LF jne @f mov ax, [ebp-0x2] diff --git a/kernel/kernel.asm b/kernel/kernel.asm index 6586c67..621971c 100644 --- a/kernel/kernel.asm +++ b/kernel/kernel.asm @@ -67,8 +67,8 @@ kmain: mov eax, SYSCALL_EXIT int 0x42 - mov al, 'X' - call cga_putc + ;mov al, 'X' + ;call cga_putc call floppy_probe diff --git a/kernel/klog.inc b/kernel/klog.inc index 4366fb0..90f336d 100644 --- a/kernel/klog.inc +++ b/kernel/klog.inc @@ -34,7 +34,9 @@ klog_print: or al, al jz @f out dx, al - ;call klog_kput + pusha + call cga_putc + popa jmp @b @@: ret @@ -125,6 +127,9 @@ klog_print_hex: .print_zero: mov al, '0' out dx, al + pusha + call cga_putc + popa jmp .end .print_number: mov [esi], byte 0 @@ -170,6 +175,9 @@ klog: mov al, '?' .putchar: out dx, al + pusha + call cga_putc + popa .next: inc esi jmp .loop