XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

allow hooks of IRQ6

Browse Source 
git-svn-id: svn://kolibrios.org@1992 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2011-07-01 10:03:33 +00:00
parent 0c9bb30d4d
commit 0462949132
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/trunk/core/dll.inc
View File

@ -119,10 +119,10 @@ align 4
.irq_5: .irq_5:
push 5 push 5
jmp .main jmp .main
; align 4 align 4
; .irq_6: .irq_6:
; push 6 push 6
; jmp .main jmp .main
align 4 align 4
.irq_7: .irq_7:
push 7 push 7
@ -171,6 +171,13 @@ align 16
cmp [v86_irqhooks+eax*8], 0 cmp [v86_irqhooks+eax*8], 0
jnz v86_irq jnz v86_irq
cmp al, 6
jnz @f
push eax
call [fdc_irq_func]
pop eax
@@:
cmp al, 14 cmp al, 14
jnz @f jnz @f
push eax push eax

18
kernel/trunk/core/sys32.inc
View File

@ -45,7 +45,7 @@ iglobal
else else
dd p_irq3, p_irq4 ;??? íåñòûêîâêà dd p_irq3, p_irq4 ;??? íåñòûêîâêà
end if end if
dd irq_serv.irq_5, p_irq6, irq_serv.irq_7 dd irq_serv.irq_5, irq_serv.irq_6, irq_serv.irq_7
dd irq_serv.irq_8, irq_serv.irq_9, irq_serv.irq_10 dd irq_serv.irq_8, irq_serv.irq_9, irq_serv.irq_10
dd irq_serv.irq_11, irq_serv.irq_12, irqD, irq_serv.irq_14, irq_serv.irq_15 dd irq_serv.irq_11, irq_serv.irq_12, irqD, irq_serv.irq_14, irq_serv.irq_15
times 16 dd unknown_interrupt ;int_0x30..int_0x3F times 16 dd unknown_interrupt ;int_0x30..int_0x3F
@ -245,20 +245,6 @@ macro irqh [num] {
p_irq6:
save_ring3_context
mov ax, app_data ;os_data
mov ds, ax
mov es, ax
mov edi, 6
cmp [v86_irqhooks+edi*8], 0
jnz v86_irq2
call fdc_irq
call ready_for_next_irq
restore_ring3_context
iret
ready_for_next_irq: ready_for_next_irq:
mov eax,5 mov eax,5
mov [check_idle_semaphore],eax mov [check_idle_semaphore],eax
@ -288,7 +274,7 @@ irqD:
iret iret
irqh 2,3,4,5,7,8,9,10,11 irqh 2,3,4,5,6,7,8,9,10,11
irqhandler: irqhandler: