From 036ce5c69d670bbbe529fbe9c3ad70a15dac02d3 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Fri, 22 Feb 2019 22:39:36 +0000 Subject: [PATCH] Apply patch from r7584 to all audio drivers. 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 --- drivers/audio/emu10k1x.asm | 15 ++------------- drivers/audio/fm801.asm | 15 ++------------- drivers/audio/intelac97.asm | 11 ++--------- drivers/audio/sis.asm | 15 ++------------- drivers/unfinished/ensoniq.asm | 10 ++-------- 5 files changed, 10 insertions(+), 56 deletions(-) diff --git a/drivers/audio/emu10k1x.asm b/drivers/audio/emu10k1x.asm index a567ecd0b..6af442efc 100644 --- a/drivers/audio/emu10k1x.asm +++ b/drivers/audio/emu10k1x.asm @@ -12,19 +12,13 @@ DEBUG equ 1 API_VERSION equ 0x01000100 -USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices IRQ_REMAP equ 0 IRQ_LINE equ 0 -;irq 0,1,2,8,12,13 недоступны +;irq 0,13 unavailable ; FEDCBA9876543210 -VALID_IRQ equ 1100111011111000b -ATTCH_IRQ equ 0000111010100000b - -if USE_COM_IRQ -ATTCH_IRQ equ 0000111010111000b -end if +VALID_IRQ equ 1101111111111110b CPU_FREQ equ 2600d @@ -393,10 +387,6 @@ proc START c uses ebx esi edi, state:dword, cmdline:dword mov esi, msgInvIRQ bt eax, ebx jnc .fail_msg - mov eax, ATTCH_IRQ - mov esi, msgAttchIRQ - bt eax, ebx - jnc .fail_msg invoke AttachIntHandler, ebx, ac97_irq, dword 0 stdcall create @@ -1111,7 +1101,6 @@ sz_sound_srv db 'SOUND',0 msgInit db 'detect hardware...',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 msgPlay db 'start play', 13,10,0 msgStop db 'stop play', 13,10,0 diff --git a/drivers/audio/fm801.asm b/drivers/audio/fm801.asm index c519e77e0..de3ff1933 100644 --- a/drivers/audio/fm801.asm +++ b/drivers/audio/fm801.asm @@ -13,16 +13,10 @@ DEBUG_IRQ equ 0 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 -VALID_IRQ equ 1100111011111000b -ATTCH_IRQ equ 0000111010100000b - -if USE_COM_IRQ -ATTCH_IRQ equ 0000111010111000b -end if +VALID_IRQ equ 1101111111111110b CPU_FREQ equ 2000d @@ -330,10 +324,6 @@ proc START c uses ebx esi edi, state:dword, cmdline:dword mov esi, msgInvIRQ bt eax, ebx jnc .fail_msg - mov eax, ATTCH_IRQ - mov esi, msgAttchIRQ - bt eax, ebx - jnc .fail_msg invoke AttachIntHandler, ebx, ac97_irq, dword 0 .reg: @@ -1016,7 +1006,6 @@ sz_sound_srv db 'SOUND',0 msgInit db 'detect hardware...',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 msgPlay db 'start play', 13,10,0 msgStop db 'stop play', 13,10,0 diff --git a/drivers/audio/intelac97.asm b/drivers/audio/intelac97.asm index 93d4d40d5..993059c44 100644 --- a/drivers/audio/intelac97.asm +++ b/drivers/audio/intelac97.asm @@ -16,19 +16,13 @@ API_VERSION equ 0x01000100 DEBUG_IRQ equ 0 -USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices IRQ_REMAP equ 0 IRQ_LINE equ 0 -;irq 0,1,2,8,12,13 недоступны +;irq 0,13 unavailable ; FEDCBA9876543210 -VALID_IRQ equ 1100111011111000b -ATTCH_IRQ equ 0000111010100000b - -if USE_COM_IRQ -ATTCH_IRQ equ 0000111010111000b -end if +VALID_IRQ equ 1101111111111110b CPU_FREQ equ 2600d @@ -1427,7 +1421,6 @@ sz_sound_srv db 'SOUND',0 msgInit db 'detect hardware...',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 msgPlay db 'start play', 13,10,0 msgStop db 'stop play', 13,10,0 diff --git a/drivers/audio/sis.asm b/drivers/audio/sis.asm index 8dd3d7b05..a2ac4fafa 100644 --- a/drivers/audio/sis.asm +++ b/drivers/audio/sis.asm @@ -13,19 +13,13 @@ DEBUG equ 1 API_VERSION equ 0x01000100 DEBUG_IRQ equ 0 -USE_COM_IRQ equ 0 ;make irq 3 and irq 4 available for PCI devices IRQ_REMAP equ 0 IRQ_LINE equ 0 -;irq 0,1,2,8,12,13 недоступны +;irq 0,13 unavailable ; FEDCBA9876543210 -VALID_IRQ equ 1100111011111000b -ATTCH_IRQ equ 0000111010100000b - -if USE_COM_IRQ -ATTCH_IRQ equ 0000111010111000b -end if +VALID_IRQ equ 1101111111111110b CPU_FREQ equ 2000d @@ -330,10 +324,6 @@ proc START c uses ebx esi edi, state:dword, cmdline:dword mov esi, msgInvIRQ bt eax, ebx jnc .fail_msg - mov eax, ATTCH_IRQ - mov esi, msgAttchIRQ - bt eax, ebx - jnc .fail_msg invoke AttachIntHandler, ebx, ac97_irq, 0 .reg: @@ -1241,7 +1231,6 @@ sz_sound_srv db 'SOUND',0 msgInit db 'detect hardware...',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 msgPlay db 'start play', 13,10,0 msgStop db 'stop play', 13,10,0 diff --git a/drivers/unfinished/ensoniq.asm b/drivers/unfinished/ensoniq.asm index 16248f02e..2207b5998 100644 --- a/drivers/unfinished/ensoniq.asm +++ b/drivers/unfinished/ensoniq.asm @@ -17,10 +17,9 @@ include 'imports.inc' REMAP_IRQ equ 0 -;irq 0,1,2,8,12,13 недоступны +;irq 0,13 unavailable ; FEDCBA9876543210 -VALID_IRQ equ 1100111011111000b -ATTCH_IRQ equ 0000111010101000b +VALID_IRQ equ 1101111111111110b IRQ_LINE equ 0 @@ -324,10 +323,6 @@ proc START stdcall, state:dword mov esi, msgInvIRQ bt eax, ebx jnc .fail - mov eax, ATTCH_IRQ - mov esi, msgAttchIRQ - bt eax, ebx - jnc .fail stdcall AttachIntHandler, ebx, ac97_irq, dword 0 stdcall RegService, sz_sound_srv, service_proc @@ -1140,7 +1135,6 @@ sz_sound_srv db 'SOUND',0 msgDetect db 'detect hardware...',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 msgPlay db 'start play', 13,10,0 msgStop db 'stop play', 13,10,0