From fe72383413e47604e4110726bebaf17d2dd20afc Mon Sep 17 00:00:00 2001
From: "Marat Zakiyanov (Mario79)" <mario79@bk.ru>
Date: Sat, 20 Aug 2011 15:18:25 +0000
Subject: [PATCH] Fix for Floppy/IRQ6 - broken from r.1380

git-svn-id: svn://kolibrios.org@2084 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/detect/dev_fd.inc | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/kernel/trunk/detect/dev_fd.inc b/kernel/trunk/detect/dev_fd.inc
index 41bedcbdc2..ff49678d23 100644
--- a/kernel/trunk/detect/dev_fd.inc
+++ b/kernel/trunk/detect/dev_fd.inc
@@ -13,18 +13,25 @@ $Revision$
 ;      поиск и занесение в таблицу приводов FDD
 ;      автор Mario79
 ;***************************************************
-        xor  eax,eax
-        mov  edi,DRIVE_DATA
-        mov  ecx,16384
-        cld
-        rep  stosd
+	xor	eax,eax
+	mov	edi,DRIVE_DATA
+	mov	ecx,16384
+	cld
+	rep	stosd
 
-      mov al,0x10
-      out 0x70,al
-      mov  cx,0xff
+	mov	al,0x10
+	out	0x70,al
+	mov	cx,0xff
 wait_cmos:
-      dec  cx
-      test cx,cx
-      jnz wait_cmos
-      in  al,0x71
-      mov [DRIVE_DATA],al
+	dec	cx
+	test	cx,cx
+	jnz	wait_cmos
+	in	al,0x71
+	mov	[DRIVE_DATA],al
+	test	al,al
+	jz	@f
+	in	al,0x21
+	and	al,10111111b	; Enable IRQ6
+	out	0x21,al
+@@:
+