From 046294913231570d7228fe77be91ae376659929f Mon Sep 17 00:00:00 2001
From: CleverMouse <theclevermouse@yandex.ru>
Date: Fri, 1 Jul 2011 10:03:33 +0000
Subject: [PATCH] allow hooks of IRQ6

git-svn-id: svn://kolibrios.org@1992 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/core/dll.inc   | 15 +++++++++++----
 kernel/trunk/core/sys32.inc | 18 ++----------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/kernel/trunk/core/dll.inc b/kernel/trunk/core/dll.inc
index feef3cf5d5..482aeca720 100644
--- a/kernel/trunk/core/dll.inc
+++ b/kernel/trunk/core/dll.inc
@@ -119,10 +119,10 @@ align 4
 .irq_5:
 	   push 5
 	   jmp .main
-; align 4
-; .irq_6:
-;	   push 6
-;	   jmp .main
+align 4
+.irq_6:
+	   push 6
+	   jmp .main
 align 4
 .irq_7:
 	   push 7
@@ -171,6 +171,13 @@ align 16
 	   cmp	 [v86_irqhooks+eax*8], 0
 	   jnz	 v86_irq
 
+	   cmp   al, 6
+	   jnz   @f
+	   push  eax
+	   call  [fdc_irq_func]
+	   pop   eax
+@@:
+
 	   cmp   al, 14
 	   jnz   @f
 	   push  eax
diff --git a/kernel/trunk/core/sys32.inc b/kernel/trunk/core/sys32.inc
index 92f1c7f641..619aa3c530 100644
--- a/kernel/trunk/core/sys32.inc
+++ b/kernel/trunk/core/sys32.inc
@@ -45,7 +45,7 @@ iglobal
     else
         dd      p_irq3, p_irq4 ;??? нестыковка
     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_11, irq_serv.irq_12, irqD, irq_serv.irq_14, irq_serv.irq_15
         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:
 	mov	eax,5
         mov     [check_idle_semaphore],eax
@@ -288,7 +274,7 @@ irqD:
         iret
 
 
-irqh 2,3,4,5,7,8,9,10,11
+irqh 2,3,4,5,6,7,8,9,10,11
 
 irqhandler: