From 2a2173154ca051053a310a5938fb667cb37bf375 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Thu, 29 May 2014 16:49:20 +0000 Subject: [PATCH] SB16: correctly reserve ports (broken since #1306) git-svn-id: svn://kolibrios.org@4961 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/drivers/sb16/sb16.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/trunk/drivers/sb16/sb16.asm b/kernel/trunk/drivers/sb16/sb16.asm index f29428b30d..d92d2fb0b5 100644 --- a/kernel/trunk/drivers/sb16/sb16.asm +++ b/kernel/trunk/drivers/sb16/sb16.asm @@ -66,21 +66,22 @@ if DEBUG mov esi, msgDSPFound call SysMsgBoardStr end if -; xor eax,eax -; mov ebx,[sb_base_port] -; lea ecx,[ebx+0xF] + xor ebx, ebx mov ecx, [sb_base_port] - lea edx, [ebx+0xF] + lea edx, [ecx+0xF] + call ReservePortArea ;these ports must be mine ! - call ReservePortArea ;these ports must be my! -if DEBUG dec eax jnz @f + +if DEBUG mov esi, msgErrRsrvPorts call SysMsgBoardStr -@@: end if + jmp .exit + +@@: call sb_setup ;clock it, etc @@ -368,8 +369,7 @@ msgErrAtchIRQ db 'failed to attach IRQ',(sb_irq_num+'0'),13,10 db 'owner',39,'s handler: ',0 msgSucAtchIRQ db 'succesfully attached IRQ',(sb_irq_num+'0') db ' as hardcoded',13,10,0 -msgErrRsrvPorts db 'failed to reserve needed ports.',13,10 - db 'Driver may work unstable',13,10,0 +msgErrRsrvPorts db 'failed to reserve needed ports.',13,10,0 msgSetVol db 'DEV_SET_MASTERVOL call came',13,10,0 msgGetVol db 'DEV_GET_MASTERVOL call came',13,10,0 msgErrDMAsetup db 'failed to setup DMA - bad channel',13,10,0