wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-09 16:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fan value problems resolved

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@128 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Frodo Looijaard committed 1998-12-27 20:08:44 +00:00
1 parent 2e8b49295a
commit b827b9a68e
6 files changed
+24 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

kernel/chips/lm78.c
+8 -6
View File
@@ -67,9 +67,9 @@
#define IN_TO_REG(val) (((val) * 10 + 8)/16)
#define IN_FROM_REG(val) (((val) * 16) / 10)
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val))/\
((val)*2*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*2*(div)))
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val)*(div)/2)/\
((val)*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*(div)))
#define TEMP_TO_REG(val) (((val)<0?(((val)-5)/10)&0xff:((val)+5)/10) & 0xff)
#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
@@ -173,7 +173,7 @@ struct lm78_data {
u8 temp; /* Register value */
u8 temp_over; /* Register value */
u8 temp_hyst; /* Register value */
u8 fan_div[2]; /* Register encoding, shifted right */
u8 fan_div[3]; /* Register encoding, shifted right */
u8 vid; /* Register encoding, combined */
u16 alarms; /* Register encoding, combined */
};
@@ -726,6 +726,8 @@ void lm78_update_client(struct i2c_client *client)
(lm78_read_value(client,LM78_REG_ALARM2) << 8);
data->last_updated = jiffies;
data->valid = 1;
data->fan_div[2] = 1;
}
up(&data->update_lock);
@@ -782,9 +784,9 @@ void lm78_fan(struct i2c_client *client, int operation, int ctl_name,
else if (operation == SENSORS_PROC_REAL_READ) {
lm78_update_client(client);
results[0] = FAN_FROM_REG(data->fan_min[nr-1],
DIV_FROM_REG(data->fan_min[nr-1]));
DIV_FROM_REG(data->fan_div[nr-1]));
results[1] = FAN_FROM_REG(data->fan[nr-1],
DIV_FROM_REG(data->fan_min[nr-1]));
DIV_FROM_REG(data->fan_div[nr-1]));
*nrels_mag = 2;
} else if (operation == SENSORS_PROC_REAL_WRITE) {
if (*nrels_mag >= 1) {
kernel/chips/lm80.c
+2 -2
View File
@@ -66,9 +66,9 @@
#define IN_FROM_REG(val,nr) (val)
#define FAN_TO_REG(val,div) ((val)==0?255:\
((1350000+(val)*(div))/((val)*(div)*2)) & 0xff)
((1350000+(val)*(div)/2)/((val)*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:\
(val)==255?0:1350000/((div)*(val)*2))
(val)==255?0:1350000/((div)*(val)))
#define TEMP_FROM_REG(val) lm80_temp_from_reg(val)
kernel/chips/w83781d.c
+2 -2
View File
@@ -86,8 +86,8 @@
#define IN_TO_REG(val,nr) (((val) * 10 + 8)/16)
#define IN_FROM_REG(val,nr) (((val) * 16) / 10)
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val))/\
((val)*2*(div))) & 0xff)
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val)*(div)/2)/\
((val)*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*2*(div)))
#define TEMP_TO_REG(val) (((val)<0?(((val)-5)/10)&0xff:((val)+5)/10) & 0xff)
src/lm78.c
+8 -6
View File
@@ -67,9 +67,9 @@
#define IN_TO_REG(val) (((val) * 10 + 8)/16)
#define IN_FROM_REG(val) (((val) * 16) / 10)
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val))/\
((val)*2*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*2*(div)))
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val)*(div)/2)/\
((val)*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*(div)))
#define TEMP_TO_REG(val) (((val)<0?(((val)-5)/10)&0xff:((val)+5)/10) & 0xff)
#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
@@ -173,7 +173,7 @@ struct lm78_data {
u8 temp; /* Register value */
u8 temp_over; /* Register value */
u8 temp_hyst; /* Register value */
u8 fan_div[2]; /* Register encoding, shifted right */
u8 fan_div[3]; /* Register encoding, shifted right */
u8 vid; /* Register encoding, combined */
u16 alarms; /* Register encoding, combined */
};
@@ -726,6 +726,8 @@ void lm78_update_client(struct i2c_client *client)
(lm78_read_value(client,LM78_REG_ALARM2) << 8);
data->last_updated = jiffies;
data->valid = 1;
data->fan_div[2] = 1;
}
up(&data->update_lock);
@@ -782,9 +784,9 @@ void lm78_fan(struct i2c_client *client, int operation, int ctl_name,
else if (operation == SENSORS_PROC_REAL_READ) {
lm78_update_client(client);
results[0] = FAN_FROM_REG(data->fan_min[nr-1],
DIV_FROM_REG(data->fan_min[nr-1]));
DIV_FROM_REG(data->fan_div[nr-1]));
results[1] = FAN_FROM_REG(data->fan[nr-1],
DIV_FROM_REG(data->fan_min[nr-1]));
DIV_FROM_REG(data->fan_div[nr-1]));
*nrels_mag = 2;
} else if (operation == SENSORS_PROC_REAL_WRITE) {
if (*nrels_mag >= 1) {
src/lm80.c
+2 -2
View File
@@ -66,9 +66,9 @@
#define IN_FROM_REG(val,nr) (val)
#define FAN_TO_REG(val,div) ((val)==0?255:\
((1350000+(val)*(div))/((val)*(div)*2)) & 0xff)
((1350000+(val)*(div)/2)/((val)*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:\
(val)==255?0:1350000/((div)*(val)*2))
(val)==255?0:1350000/((div)*(val)))
#define TEMP_FROM_REG(val) lm80_temp_from_reg(val)
src/w83781d.c
+2 -2
View File
@@ -86,8 +86,8 @@
#define IN_TO_REG(val,nr) (((val) * 10 + 8)/16)
#define IN_FROM_REG(val,nr) (((val) * 16) / 10)
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val))/\
((val)*2*(div))) & 0xff)
#define FAN_TO_REG(val,div) ((val)==0?255:((1350000+(val)*(div)/2)/\
((val)*(div))) & 0xff)
#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*2*(div)))
#define TEMP_TO_REG(val) (((val)<0?(((val)-5)/10)&0xff:((val)+5)/10) & 0xff)