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

Dont try to scan multiple functions on a single function device.

Browse Source 
Load SB16 driver when no compatible PCI soundcard was found.

git-svn-id: svn://kolibrios.org@5168 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-11-04 16:56:34 +00:00
parent ce25720d9f
commit 733343d310
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/audio/sound.asm
View File

@ -13,6 +13,7 @@ entry START
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 '../pci.inc'
include '../macros.inc' include '../macros.inc'
include '../peimport.inc' include '../peimport.inc'
@ -204,14 +205,14 @@ endl
inc eax inc eax
invoke PciApi invoke PciApi
cmp eax, -1 cmp eax, -1
je .err je .no_pci
mov [last_bus], eax mov [last_bus], eax
.next_bus: .next_bus:
and [devfn], 0 and [devfn], 0
.next_dev: .next_dev:
invoke PciRead32, [bus], [devfn], dword 0 invoke PciRead32, [bus], [devfn], PCI_header.vendor_id
test eax, eax test eax, eax
jz .next jz .next
cmp eax, -1 cmp eax, -1
@ -227,7 +228,16 @@ endl
je .found je .found
add edi, 8 add edi, 8
jmp @B jmp @B
.next: .next:
test [devfn], 7
jnz .next_fn
invoke PciRead32, [bus], [devfn], PCI_header.header_type
test al, al
js .next_fn
or [devfn], 7
.next_fn:
inc [devfn] inc [devfn]
cmp [devfn], 256 cmp [devfn], 256
jb .next_dev jb .next_dev
@ -236,10 +246,31 @@ endl
mov [bus], eax mov [bus], eax
cmp eax, [last_bus] cmp eax, [last_bus]
jna .next_bus jna .next_bus
xor eax, eax
ret
.found:
.no_pci:
if DEBUG
mov esi, msgFail
invoke SysMsgBoardStr
mov esi, msgLoading
invoke SysMsgBoardStr
mov esi, sb16
invoke SysMsgBoardStr
mov esi, msgNewline
invoke SysMsgBoardStr
end if
invoke GetService, sb16
test eax, eax
jz .fail
mov edx, [eax+SRV.entry]
mov [srv_entry], edx
ret
.found:
if DEBUG if DEBUG
mov esi, msgLoading mov esi, msgLoading
invoke SysMsgBoardStr invoke SysMsgBoardStr
@ -253,18 +284,13 @@ endl
invoke GetService, dword[edi+4] invoke GetService, dword[edi+4]
test eax, eax test eax, eax
jz .err jz .next
mov edx, [eax+SRV.entry] mov edx, [eax+SRV.entry]
mov [srv_entry], edx mov [srv_entry], edx
ret ret
.err: .fail:
if DEBUG
mov esi, msgFail
invoke SysMsgBoardStr
end if
xor eax, eax xor eax, eax
ret ret
@ -403,9 +429,10 @@ fm801 db 'FM801', 0
ensoniq db 'ENSONIQ', 0 ensoniq db 'ENSONIQ', 0
emu10k1x db 'EMU10K1X', 0 emu10k1x db 'EMU10K1X', 0
intelhda db 'INTEL_HDA', 0 intelhda db 'INTEL_HDA', 0
sb16 db 'SB16', 0
msgInit db 'Detecting hardware...',13,10,0 msgInit db 'Detecting hardware...',13,10,0
msgFail db 'No compatible soundcard found!',13,10,0 msgFail db 'No compatible PCI soundcard found!',13,10,0
msgLoading db 'Loading ',0 msgLoading db 'Loading ',0
msgNewline db 13,10,0 msgNewline db 13,10,0