Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Bugfix for new sound.sys

Browse Source 
git-svn-id: svn://kolibrios.org@5071 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-08-29 19:53:38 +00:00
parent 205caf29cf
commit 54e9aebe23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/audio/sound.asm
View File

@ -11,10 +11,10 @@ entry START
DEBUG = 1 DEBUG = 1
section '.flat' code readable writable executable section '.flat' code readable writable executable
include '../proc32.inc' include '../proc32.inc'
include '../struct.inc' include '../struct.inc'
include '../macros.inc' include '../macros.inc'
include '../peimport.inc'
VID_INTEL = 0x8086 VID_INTEL = 0x8086
VID_NVIDIA = 0x10DE VID_NVIDIA = 0x10DE
@ -163,23 +163,17 @@ ends
proc START c, state:dword, cmdline:dword proc START c, state:dword, cmdline:dword
cmp [state], 1 cmp [state], 1
jne .stop jne .fail
if DEBUG if DEBUG
mov esi, msgInit mov esi, msgInit
invoke SysMsgBoardStr invoke SysMsgBoardStr
end if end if
test eax, eax
jnz .done
call detect_controller call detect_controller
ret ret
.stop:
test eax, eax .fail:
jz .done
leave
jmp eax
.done:
xor eax, eax xor eax, eax
ret ret
endp endp
@ -235,6 +229,10 @@ endl
mov [bus], eax mov [bus], eax
cmp eax, [last_bus] cmp eax, [last_bus]
jna .next_bus jna .next_bus
if DEBUG
mov esi, msgNotFound
invoke SysMsgBoardStr
end if
xor eax, eax xor eax, eax
ret ret
.found: .found:
@ -404,10 +402,13 @@ emu10k1x db 'EMU10K1X', 0
intelhda db 'INTEL_HDA', 0 intelhda db 'INTEL_HDA', 0
msgInit db 'Detecting hardware...',13,10,0 msgInit db 'Detecting hardware...',13,10,0
msgFail db 'No compatible soundcard found!',13,10,0 msgNotFound db 'No compatible soundcard found!',13,10,0
msgFail db 'Failed',13,10,0
msgLoading db 'Loading ',0 msgLoading db 'Loading ',0
msgNewline db 13,10,0 msgNewline db 13,10,0
align 4 align 4
data fixups data fixups
end data end data
include '../peimport.inc'