Changeset 330 for lm-sensors/trunk/kernel/chips/gl518sm.c

Timestamp:

03/22/99 00:47:20 (14 years ago)

Author:

mds

Message:

fixed off-by-factor-of-2 of FAN_FROM_REG in w83781d.
Improved bounds checking for FAN_TO_REG in all files.
For lm78-compatible drivers, minimum speed is 2657 RPM when the
divisor is 2. Attempts to set lower than that now are set to 0.
Before was set to a random number.
Thanks Jeff Dairiki.

Files:

• lm-sensors/trunk/kernel/chips/gl518sm.c (modified) (1 diff)

lm-sensors/trunk/kernel/chips/gl518sm.c

@@ -64 +64 @@
 #define TEMP_FROM_REG(val) (((val) - 119) * 10)
 
-#define FAN_TO_REG(val,div) \
- (( (val)==0 ? 255 : ((960000+(val)*(div))/(2*(val)*(div))) ) & 0xff)
+static inline unsigned char
+FAN_TO_REG (unsigned rpm, unsigned divisor)
+{
+  unsigned val;
+  
+  if (rpm == 0)
+      return 255;
+
+  val = (960000 + rpm * divisor) / (2 * rpm * divisor);
+  if (val > 255)
+      val = 255;
+  return val;
+}
 #define FAN_FROM_REG(val,div) \
  ( (val)==0 ? 0 : (val)==255 ? 0 : (960000/(2*(val)*(div))) )