From eb55d78ee273aa637197dec39cef665e46fc31aa Mon Sep 17 00:00:00 2001
From: "Iliya Mihailov (Ghost)" <ghost.nsk@gmail.com>
Date: Tue, 22 May 2007 17:57:00 +0000
Subject: [PATCH] GMon * bug fix in it87_get_fan_speed

git-svn-id: svn://kolibrios.org@518 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/gmon/{HISTORY.ru => HISTORY.txt} | 1 +
 programs/system/gmon/gmon.asm                    | 2 +-
 programs/system/gmon/hwm_it87.inc                | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename programs/system/gmon/{HISTORY.ru => HISTORY.txt} (95%)

diff --git a/programs/system/gmon/HISTORY.ru b/programs/system/gmon/HISTORY.txt
similarity index 95%
rename from programs/system/gmon/HISTORY.ru
rename to programs/system/gmon/HISTORY.txt
index cefb74c526..7455b72965 100644
--- a/programs/system/gmon/HISTORY.ru
+++ b/programs/system/gmon/HISTORY.txt
@@ -4,6 +4,7 @@ Copyright (C) 2005, 2006, 2007 Mihailov Ilia (ghost.nsk@mail.ru)
 All Right Reserved
 
 
+23/05/2007 - исправлена ошибка в it87_get_fan_speed, найдена SPraid
 16/05/2007 - ASCIIZ имена чипов, вынесена история
 31/01/2007 - исправлена ошибка внесённая 17/07/06 в определение множителя для Intel NorthWood
 26/12/2006 - исправленна глупая ошибка в определении ITE и uGuru
diff --git a/programs/system/gmon/gmon.asm b/programs/system/gmon/gmon.asm
index c4201fb2ec..3f7f48fffd 100644
--- a/programs/system/gmon/gmon.asm
+++ b/programs/system/gmon/gmon.asm
@@ -465,7 +465,7 @@ about_tab:
 DATA
 act_tab		db	2 			; Номер активной вкладки
 tab_lab		db	'Info       Tests      Configs     About'
-title		db	'Ghost Monitor v0.4 [16/05/07]',0
+title		db	'Ghost Monitor v0.4 [23/05/07]',0
 
 msgs_mon mls \
 	'CPU Load (%)',\
diff --git a/programs/system/gmon/hwm_it87.inc b/programs/system/gmon/hwm_it87.inc
index f209eb5d88..cf0b66fbd8 100644
--- a/programs/system/gmon/hwm_it87.inc
+++ b/programs/system/gmon/hwm_it87.inc
@@ -154,6 +154,11 @@ it87_get_fan_speed:
 @@:	mov	al, 0x0D
 	add	al, cl
 	call	[IO_Read]
+	
+	test	al, al
+	jz	@f
+	cmp	al, 0xff
+	je	@f	
 
 	movzx	ebx, al
 	push	ecx
@@ -167,7 +172,7 @@ it87_get_fan_speed:
 	inc	ecx
 	cmp	ecx, 3
 	jb	@b
-
+@@:
 	ret
 ;--------------------------------------------------------------------------
 ;