From 744136001366d1a04f7930f37f6777128e8436e1 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Sat, 1 Feb 2014 14:22:21 +0000 Subject: [PATCH] Serial debug console: reserve port so nobody else uses it. git-svn-id: svn://kolibrios.org@4553 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/kernel.asm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index e6854a138a..4e570d996d 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -1079,27 +1079,29 @@ endg DEBUGF 1, "K : IRQ1 error code %x\n", eax .no_keyboard: -; SET MOUSE +; Load PS/2 mouse driver stdcall load_driver, szPS2MDriver -; stdcall load_driver, szCOM_MDriver mov esi, boot_setmouse call boot_log call setmouse ; Setup serial output console (if enabled) - if defined debug_com_base - ; enable Divisor latch + ; reserve port so nobody else will use it + xor ebx, ebx + mov ecx, debug_com_base + mov edx, debug_com_base+7 + call r_f_port_area + ; enable Divisor latch mov dx, debug_com_base+3 mov al, 1 shl 7 out dx, al ; Set speed to 115200 baud (max speed) - mov dx, debug_com_base mov al, 0x01 out dx, al @@ -1109,25 +1111,22 @@ if defined debug_com_base out dx, al ; No parity, 8bits words, one stop bit, dlab bit back to 0 - mov dx, debug_com_base+3 mov al, 3 out dx, al ; disable interrupts - mov dx, debug_com_base+1 mov al, 0 out dx, al ; clear + enable fifo (64 bits) - mov dx, debug_com_base+2 mov al, 0x7 + 1 shl 5 out dx, al - end if + mov eax, [version_inf.rev] DEBUGF 1, "K : kernel SVN r%d\n", eax