From 2a96dafd9f3ec0df093af71d1606b60074d4138f Mon Sep 17 00:00:00 2001
From: Ivan Poddubny <ivan.poddubny@gmail.com>
Date: Mon, 24 Oct 2005 17:14:59 +0000
Subject: [PATCH] Bugfixes 1) Bug in task switching (0xffff = 1 without task
 switch) 2) Bug with IRQ6 (floppy) - "call fdc_irq" was deleted earlier

git-svn-id: svn://kolibrios.org@11 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/core/sched.inc |  2 +-
 kernel/trunk/core/sys32.inc | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kernel/trunk/core/sched.inc b/kernel/trunk/core/sched.inc
index c4accd9f41..6eaee3c9c6 100644
--- a/kernel/trunk/core/sched.inc
+++ b/kernel/trunk/core/sched.inc
@@ -83,7 +83,7 @@ irq0:
         cmp   [0xffff],byte 0
         je    .switch
         dec   byte [0xffff]
-        jmp   @f
+        jz    @f
      .switch:
         jmp   pword [0xB000]
         inc   [context_counter] ;noname & halyavin
diff --git a/kernel/trunk/core/sys32.inc b/kernel/trunk/core/sys32.inc
index 7dd0bed04c..fdb706230f 100644
--- a/kernel/trunk/core/sys32.inc
+++ b/kernel/trunk/core/sys32.inc
@@ -319,7 +319,7 @@ macro irqh [num]
      jmp   irq_c
 }
 
-irqh 2,3,4,5,6,7,8,9,10,11,12,14,15
+irqh 2,3,4,5,7,8,9,10,11,12,14,15
 
  irq_c:
      push  ds es
@@ -330,7 +330,18 @@ irqh 2,3,4,5,6,7,8,9,10,11,12,14,15
      pop   es ds
      popad
      iret
-  	
+
+p_irq6:
+     pushad
+     push  ds es
+     mov   ax, os_data
+     mov   ds, ax
+     mov   es, ax
+     call  fdc_irq
+     pop   es ds
+     popad
+     iret
+
 irqD:
      pushad
      push  ds es