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

Apply patch from r7584 to all audio drivers.

Browse Source 
Allow audio drivers to use IRQs 1,2,8,12, this is MenuetOS legacy.

git-svn-id: svn://kolibrios.org@7585 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2019-02-22 22:39:36 +00:00
parent f48620ab51
commit 036ce5c69d
5 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/audio/emu10k1x.asm
View File

@ -12,19 +12,13 @@ DEBUG equ 1
API_VERSION equ 0x01000100 API_VERSION equ 0x01000100
USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices
IRQ_REMAP equ 0 IRQ_REMAP equ 0
IRQ_LINE equ 0 IRQ_LINE equ 0
;irq 0,1,2,8,12,13 недоступны ;irq 0,13 unavailable
; FEDCBA9876543210 ; FEDCBA9876543210
VALID_IRQ equ 1100111011111000b VALID_IRQ equ 1101111111111110b
ATTCH_IRQ equ 0000111010100000b
if USE_COM_IRQ
ATTCH_IRQ equ 0000111010111000b
end if
CPU_FREQ equ 2600d CPU_FREQ equ 2600d
@ -393,10 +387,6 @@ proc START c uses ebx esi edi, state:dword, cmdline:dword
mov esi, msgInvIRQ mov esi, msgInvIRQ
bt eax, ebx bt eax, ebx
jnc .fail_msg jnc .fail_msg
mov eax, ATTCH_IRQ
mov esi, msgAttchIRQ
bt eax, ebx
jnc .fail_msg
invoke AttachIntHandler, ebx, ac97_irq, dword 0 invoke AttachIntHandler, ebx, ac97_irq, dword 0
stdcall create stdcall create
@ -1111,7 +1101,6 @@ sz_sound_srv db 'SOUND',0
msgInit db 'detect hardware...',13,10,0 msgInit db 'detect hardware...',13,10,0
msgFail db 'device not found',13,10,0 msgFail db 'device not found',13,10,0
msgAttchIRQ db 'IRQ line not supported', 13,10, 0
msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0 msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0
msgPlay db 'start play', 13,10,0 msgPlay db 'start play', 13,10,0
msgStop db 'stop play', 13,10,0 msgStop db 'stop play', 13,10,0

15
drivers/audio/fm801.asm
View File

@ -13,16 +13,10 @@ DEBUG_IRQ equ 0
API_VERSION equ 0x01000100 API_VERSION equ 0x01000100
USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices
;irq 0,1,2,8,12,13 недоступны ;irq 0,13 unavailable
; FEDCBA9876543210 ; FEDCBA9876543210
VALID_IRQ equ 1100111011111000b VALID_IRQ equ 1101111111111110b
ATTCH_IRQ equ 0000111010100000b
if USE_COM_IRQ
ATTCH_IRQ equ 0000111010111000b
end if
CPU_FREQ equ 2000d CPU_FREQ equ 2000d
@ -330,10 +324,6 @@ proc START c uses ebx esi edi, state:dword, cmdline:dword
mov esi, msgInvIRQ mov esi, msgInvIRQ
bt eax, ebx bt eax, ebx
jnc .fail_msg jnc .fail_msg
mov eax, ATTCH_IRQ
mov esi, msgAttchIRQ
bt eax, ebx
jnc .fail_msg
invoke AttachIntHandler, ebx, ac97_irq, dword 0 invoke AttachIntHandler, ebx, ac97_irq, dword 0
.reg: .reg:
@ -1016,7 +1006,6 @@ sz_sound_srv db 'SOUND',0
msgInit db 'detect hardware...',13,10,0 msgInit db 'detect hardware...',13,10,0
msgFail db 'device not found',13,10,0 msgFail db 'device not found',13,10,0
msgAttchIRQ db 'IRQ line not supported', 13,10, 0
msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0 msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0
msgPlay db 'start play', 13,10,0 msgPlay db 'start play', 13,10,0
msgStop db 'stop play', 13,10,0 msgStop db 'stop play', 13,10,0

11
drivers/audio/intelac97.asm
View File

@ -16,19 +16,13 @@ API_VERSION equ 0x01000100
DEBUG_IRQ equ 0 DEBUG_IRQ equ 0
USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices
IRQ_REMAP equ 0 IRQ_REMAP equ 0
IRQ_LINE equ 0 IRQ_LINE equ 0
;irq 0,1,2,8,12,13 недоступны ;irq 0,13 unavailable
; FEDCBA9876543210 ; FEDCBA9876543210
VALID_IRQ equ 1100111011111000b VALID_IRQ equ 1101111111111110b
ATTCH_IRQ equ 0000111010100000b
if USE_COM_IRQ
ATTCH_IRQ equ 0000111010111000b
end if
CPU_FREQ equ 2600d CPU_FREQ equ 2600d
@ -1427,7 +1421,6 @@ sz_sound_srv db 'SOUND',0
msgInit db 'detect hardware...',13,10,0 msgInit db 'detect hardware...',13,10,0
msgFail db 'device not found',13,10,0 msgFail db 'device not found',13,10,0
msgAttchIRQ db 'IRQ line not supported', 13,10, 0
msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0 msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0
msgPlay db 'start play', 13,10,0 msgPlay db 'start play', 13,10,0
msgStop db 'stop play', 13,10,0 msgStop db 'stop play', 13,10,0

15
drivers/audio/sis.asm
View File

@ -13,19 +13,13 @@ DEBUG equ 1
API_VERSION equ 0x01000100 API_VERSION equ 0x01000100
DEBUG_IRQ equ 0 DEBUG_IRQ equ 0
USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices
IRQ_REMAP equ 0 IRQ_REMAP equ 0
IRQ_LINE equ 0 IRQ_LINE equ 0
;irq 0,1,2,8,12,13 недоступны ;irq 0,13 unavailable
; FEDCBA9876543210 ; FEDCBA9876543210
VALID_IRQ equ 1100111011111000b VALID_IRQ equ 1101111111111110b
ATTCH_IRQ equ 0000111010100000b
if USE_COM_IRQ
ATTCH_IRQ equ 0000111010111000b
end if
CPU_FREQ equ 2000d CPU_FREQ equ 2000d
@ -330,10 +324,6 @@ proc START c uses ebx esi edi, state:dword, cmdline:dword
mov esi, msgInvIRQ mov esi, msgInvIRQ
bt eax, ebx bt eax, ebx
jnc .fail_msg jnc .fail_msg
mov eax, ATTCH_IRQ
mov esi, msgAttchIRQ
bt eax, ebx
jnc .fail_msg
invoke AttachIntHandler, ebx, ac97_irq, 0 invoke AttachIntHandler, ebx, ac97_irq, 0
.reg: .reg:
@ -1241,7 +1231,6 @@ sz_sound_srv db 'SOUND',0
msgInit db 'detect hardware...',13,10,0 msgInit db 'detect hardware...',13,10,0
msgFail db 'device not found',13,10,0 msgFail db 'device not found',13,10,0
msgAttchIRQ db 'IRQ line not supported', 13,10, 0
msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0 msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0
msgPlay db 'start play', 13,10,0 msgPlay db 'start play', 13,10,0
msgStop db 'stop play', 13,10,0 msgStop db 'stop play', 13,10,0

10
drivers/unfinished/ensoniq.asm
View File

@ -17,10 +17,9 @@ include 'imports.inc'
REMAP_IRQ equ 0 REMAP_IRQ equ 0
;irq 0,1,2,8,12,13 недоступны ;irq 0,13 unavailable
; FEDCBA9876543210 ; FEDCBA9876543210
VALID_IRQ equ 1100111011111000b VALID_IRQ equ 1101111111111110b
ATTCH_IRQ equ 0000111010101000b
IRQ_LINE equ 0 IRQ_LINE equ 0
@ -324,10 +323,6 @@ proc START stdcall, state:dword
mov esi, msgInvIRQ mov esi, msgInvIRQ
bt eax, ebx bt eax, ebx
jnc .fail jnc .fail
mov eax, ATTCH_IRQ
mov esi, msgAttchIRQ
bt eax, ebx
jnc .fail
stdcall AttachIntHandler, ebx, ac97_irq, dword 0 stdcall AttachIntHandler, ebx, ac97_irq, dword 0
stdcall RegService, sz_sound_srv, service_proc stdcall RegService, sz_sound_srv, service_proc
@ -1140,7 +1135,6 @@ sz_sound_srv db 'SOUND',0
msgDetect db 'detect hardware...',13,10,0 msgDetect db 'detect hardware...',13,10,0
msgFail db 'device not found',13,10,0 msgFail db 'device not found',13,10,0
msgAttchIRQ db 'IRQ line not supported', 13,10, 0
msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0 msgInvIRQ db 'IRQ line not assigned or invalid', 13,10, 0
msgPlay db 'start play', 13,10,0 msgPlay db 'start play', 13,10,0
msgStop db 'stop play', 13,10,0 msgStop db 'stop play', 13,10,0