Changeset 5119
- Timestamp:
- 02/08/08 11:34:10 (10 months ago)
- Files:
-
- lm-sensors/trunk/CHANGES (modified) (1 diff)
- lm-sensors/trunk/kernel/chips/gl518sm.c (modified) (1 diff)
- lm-sensors/trunk/kernel/chips/gl520sm.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lm-sensors/trunk/CHANGES
r5118 r5119 12 12 Drop useless debugging log messages 13 13 Recognize VGN as a valid Sony Vaio name prefix (2.6 backport) 14 Module gl518sm: Fix fan speed reading (2.6 backport) 15 Module gl520sm: Fix fan speed reading (2.6 backport) 14 16 Program decode-dimms.pl: Fix DDR2 SDRAM module speed decoding 15 17 Update manufacturer IDs. lm-sensors/trunk/kernel/chips/gl518sm.c
r4651 r5119 86 86 return 255; 87 87 rpm = SENSORS_LIMIT(rpm, 1, 1000000); 88 return SENSORS_LIMIT(( 960000 + rpm * div / 2) / (rpm * div), 1,88 return SENSORS_LIMIT((480000 + rpm * div / 2) / (rpm * div), 1, 89 89 254); 90 90 } 91 91 92 92 #define FAN_FROM_REG(val,div) \ 93 ( (val)==0 ? 0 : (val)==255 ? 0 : ( 960000/((val)*(div))) )93 ( (val)==0 ? 0 : (val)==255 ? 0 : (480000/((val)*(div))) ) 94 94 95 95 #define IN_TO_REG(val) (SENSORS_LIMIT((((val)*10+8)/19),0,255)) lm-sensors/trunk/kernel/chips/gl520sm.c
r4651 r5119 88 88 return 255; 89 89 rpm = SENSORS_LIMIT(rpm, 1, 1000000); 90 return SENSORS_LIMIT(( 960000 + rpm * div / 2) / (rpm * div), 1,90 return SENSORS_LIMIT((480000 + rpm * div / 2) / (rpm * div), 1, 91 91 254); 92 92 } 93 93 94 94 #define FAN_FROM_REG(val,div) \ 95 ( (val)==0 ? 0 : (val)==255 ? 0 : ( 960000/((val)*(div))) )95 ( (val)==0 ? 0 : (val)==255 ? 0 : (480000/((val)*(div))) ) 96 96 97 97 #define IN_TO_REG(val) (SENSORS_LIMIT((((val)*10+8)/19),0,255))
