From 40e696a566dc99f34ff0b91e4385b211b9ab9e79 Mon Sep 17 00:00:00 2001 From: Galkov Date: Thu, 9 Apr 2009 09:28:58 +0000 Subject: [PATCH] oops: fix, that was needed in rev#1055 - changing EVENT interface function git-svn-id: svn://kolibrios.org@1058 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/drivers/infinity.asm | 10 ++-------- kernel/trunk/drivers/mixer.asm | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/kernel/trunk/drivers/infinity.asm b/kernel/trunk/drivers/infinity.asm index 1bf9859ee9..bcfbe909d4 100644 --- a/kernel/trunk/drivers/infinity.asm +++ b/kernel/trunk/drivers/infinity.asm @@ -478,8 +478,8 @@ proc CreateBuffer stdcall, format:dword, size:dword mov ecx, (64*1024)/4 rep stosd - xor edx, edx - mov ebx, MANUAL_DESTROY + xor esi, esi + mov ecx, MANUAL_DESTROY call CreateEvent mov ebx, [str] @@ -1304,9 +1304,3 @@ str.bk rd 1 mix_2_core rd 1 mix_3_core rd 1 mix_4_core rd 1 - - - - - - diff --git a/kernel/trunk/drivers/mixer.asm b/kernel/trunk/drivers/mixer.asm index 6c26671ad2..f825ef4612 100644 --- a/kernel/trunk/drivers/mixer.asm +++ b/kernel/trunk/drivers/mixer.asm @@ -190,9 +190,9 @@ proc refill stdcall, str:dword jz .exit mov ebx, [ebx+STREAM.notify_id] - mov ecx, EVENT_WATCHED - xor edx, edx - call RaiseEvent ;eax, ebx, ecx, edx + mov edx, EVENT_WATCHED + xor esi, esi + call RaiseEvent ;eax, ebx, edx, esi .exit: ret endp @@ -250,20 +250,20 @@ proc refill_ring stdcall, str:dword sub eax, [ebx+STREAM.in_base] sub eax, 128 - lea edx, [event] + lea esi, [event] - mov dword [edx], RT_INP_EMPTY - mov dword [edx+4], 0 - mov dword [edx+8], ebx - mov dword [edx+12], eax + mov dword [esi], RT_INP_EMPTY + mov dword [esi+4], 0 + mov dword [esi+8], ebx + mov dword [esi+12], eax mov eax, [ebx+STREAM.notify_event] test eax, eax jz .exit mov ebx, [ebx+STREAM.notify_id] - xor ecx, ecx - call RaiseEvent ;eax, ebx, ecx, edx + xor edx, edx + call RaiseEvent ;eax, ebx, edx, esi .exit: ret endp @@ -1260,4 +1260,3 @@ proc new_mix stdcall, output:dword endp end if -