undo r3594 and fix the problem properly

git-svn-id: svn://kolibrios.org@3753 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2013-07-03 18:47:31 +00:00
parent b5b5e68553
commit 98dff22e53

View File

@ -806,7 +806,7 @@ restore out_size
align 4 align 4
proc hda_irq ;+ proc hda_irq ;+
;spin_lock spin_lock
if DEBUG_IRQ if DEBUG_IRQ
push eax esi push eax esi
;mov esi, msgIRQ ;mov esi, msgIRQ
@ -820,7 +820,7 @@ proc hda_irq ;+
call azx_readl call azx_readl
test eax, eax test eax, eax
jnz @f jnz @f
;spin_unlock spin_unlock
ret ret
@@: @@:
mov ebx, eax ; status mov ebx, eax ; status
@ -886,7 +886,7 @@ proc hda_irq ;+
@@: @@:
;end if ;end if
or eax, 1 or eax, 1
;spin_unlock spin_unlock
ret ret
endp endp
@ -1334,19 +1334,19 @@ endp
align 4 align 4
play: play:
;spin_lock spin_lock_irq
mov edx, ICH6_REG_WALLCLK mov edx, ICH6_REG_WALLCLK
call azx_readl call azx_readl
mov [ctrl.start_wallclk], eax mov [ctrl.start_wallclk], eax
call azx_stream_start call azx_stream_start
xor eax, eax xor eax, eax
;spin_unlock spin_unlock_irq
ret ret
align 4 align 4
stop: stop:
;spin_lock spin_lock_irq
;* call azx_stream_stop ;Asper: Hangs system ;* call azx_stream_stop ;Asper: Hangs system
;R push ebx ecx edx ;R push ebx ecx edx
;R ; stop DMA ;R ; stop DMA
@ -1386,7 +1386,7 @@ stop:
;Asper ] ;Asper ]
xor eax, eax xor eax, eax
;spin_unlock spin_unlock_irq
ret ret
;align 4 ;align 4