From db52f427a60675f329daae844760fa6b272c3a1a Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Fri, 23 Feb 2001 03:23:49 +0000
Subject: [PATCH] Change mtp008 temperature reporting from max/min to
 limit/hyst.       Change initial values in driver from 70/5 to 70/50.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1032 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES               | 9 +++++----
 kernel/chips/mtp008.c | 8 ++++----
 prog/sensors/chips.c  | 8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 24438cd5..c400e2fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,7 @@ ask CVS about it:
         Also, mkpatch is probably broken right now.
   File doc/FAQ: Many updates and additions
   File doc/chips/via686a: Claim support for 686b.
-  File sensors.conf.eg: Adjust as99127f in5 (-12V) and temp2 calculations
+  File sensors.conf.eg: Adjust as99127f in5 (-12V) and temp2 calculations;
                         Add lm87 template; enhance help comments in file
   File sensors.c: Add xxx_init() calls for drivers added to mkpatch in 2.5.5.
   Include file i2c-isa.h: No longer required, moved to i2c.h in i2c package
@@ -35,14 +35,15 @@ ask CVS about it:
   Module i2c-i810: Fixed i2c_i810_init() not found in patched kernel
   Module lm78: Recognize chipid=0x20
   Module lm87: Fix in0, in1 (2.5V and Vccp1) calculations
-  Module mtp008: Fix temp2 max initialization
+  Module mtp008: Fix temp initializations;
                  Save BIOS pin configuration of temps and fans
   Module sensors: Disabled, moved to i2c package as i2c-proc.c
   Module via686a: Allow force=9191,address (for A7V/K7V boards)
   Program mkpatch.pl: Fix adm9240 typos, add more chips to Configure.help
   Program sensord: Add -d (debug) and -p (pid-file) options
-  Program sensors: Change reported version from 1.3 to the lm_sensors version.
-                   Fix swapped limit and hysteresis on 9240, 5595, 686a.
+  Program sensors: Change reported version from 1.3 to the lm_sensors version;
+                   Fix swapped limit and hysteresis on 9240, 5595, 686a;
+                   Change mtp008 temps from max/min to limit/hyst.
   Program sensors-detect: Recognize lm78 with chipid=0x20
                           Recognize SMSC Victory66 South Bridge
 
diff --git a/kernel/chips/mtp008.c b/kernel/chips/mtp008.c
index ea346c23..ee60a421 100644
--- a/kernel/chips/mtp008.c
+++ b/kernel/chips/mtp008.c
@@ -241,10 +241,10 @@ extern inline u8 FAN_TO_REG(long rpm, int div)
 #define MTP008_INIT_FAN_MIN_2	3000
 #define MTP008_INIT_FAN_MIN_3	3000
 
-#define MTP008_INIT_TEMP_OVER	700				/* 70 Celsius */
-#define MTP008_INIT_TEMP_HYST	50				/* 5 Celsius */
-#define MTP008_INIT_TEMP2_OVER	700				/* 70 Celsius */
-#define MTP008_INIT_TEMP2_HYST	50				/* 5 Celsius */
+#define MTP008_INIT_TEMP_OVER	700			/* 70 Celsius */
+#define MTP008_INIT_TEMP_HYST	500			/* 50 Celsius */
+#define MTP008_INIT_TEMP2_OVER	700			/* 70 Celsius */
+#define MTP008_INIT_TEMP2_HYST	500			/* 50 Celsius */
 
 #ifdef MODULE
 extern int init_module(void);
diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c
index 48415416..727f4f75 100644
--- a/prog/sensors/chips.c
+++ b/prog/sensors/chips.c
@@ -77,7 +77,7 @@ void print_temp_info( float cur, float over, float hyst, int minmax )
    if(minmax == MINMAX)
 	printf( "%+3.1f%s   (min = %+3.0f%s, max = %+3.0f%s)",
            n_cur, degv, n_hyst, degv, n_over, degv );
-   else
+   else /* HYST */
 	printf( "%+3.1f%s   (limit = %+3.0f%s, hysteresis = %+3.0f%s)",
            n_cur, degv, n_over, degv, n_hyst, degv );
 }
@@ -1598,7 +1598,7 @@ void print_mtp008(const sensors_chip_name *name)
       !sensors_get_feature(*name,SENSORS_MTP008_TEMP1_OVER,&max)) {
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, max, min, MINMAX );
+      print_temp_info( cur, max, min, HYST );
       printf(" %s\n", alarms&MTP008_ALARM_TEMP1?"ALARM":"");
     }
   } else
@@ -1611,7 +1611,7 @@ void print_mtp008(const sensors_chip_name *name)
       !sensors_get_feature(*name,SENSORS_MTP008_TEMP2_OVER,&max)) {
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, max, min, MINMAX );
+      print_temp_info( cur, max, min, HYST );
       printf(" %s\n", alarms&MTP008_ALARM_TEMP2?"ALARM":"");
     }
   } else
@@ -1624,7 +1624,7 @@ void print_mtp008(const sensors_chip_name *name)
       !sensors_get_feature(*name,SENSORS_MTP008_TEMP3_OVER,&max)) {
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, max, min, MINMAX );
+      print_temp_info( cur, max, min, HYST );
       printf(" %s\n", alarms&MTP008_ALARM_TEMP3?"ALARM":"");
     }
   } else