Changeset 4952

Timestamp:

10/14/07 14:00:15 (1 year ago)

Author:

jwrdegoede

Message:

Several fixes to the fschmd support

Files:

• lm-sensors/trunk/lib/chips.c (modified) (1 diff)
• lm-sensors/trunk/lib/proc.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (3 diffs)

lm-sensors/trunk/lib/chips.c

@@ -6343 +6343 @@
-                NOSYSCTL, VALUE(1), 0 }, \
-        { { SENSORS_FSCHMD_FAN_DIV(nr), "fan" #nr "_div", \
-
+W
-                NOSYSCTL, VALUE(nr), 0 }, \
-        { { SENSORS_FSCHMD_FAN_ALARM(nr), "fan" #nr "_alarm", \

lm-sensors/trunk/lib/proc.c

@@ -456 +456 @@
-/* give up, use old name (probably won't work though...) */
-/* known to be the same:
-
-
+
-*/
-        strcpy(sysname, name);

lm-sensors/trunk/prog/sensors/chips.c

@@ -6355 +6355 @@
-               alarm ? "ALARM" : "");
-    }
-
-
-
-
+
+
+
-  free(label);
-}
@@ -6388 +6387 @@
-      }
-    }
-
-
-
-
+
+
+
-  free(label);
-}
@@ -6398 +6396 @@
-{
-  int i;
+  int no_fan_sensors, no_temp_sensors;
+
+  if (!strcmp(name->prefix,"fschmd")) {
+    no_fan_sensors = 5;
+    no_temp_sensors = 5;
+  } else { /* fschrc */
+    no_fan_sensors = 4;
+    no_temp_sensors = 3;
+  }
-  
-  for (i = 0; i <= 2; i++)
-    print_fschmd_in(name, i, SENSORS_FSCHMD_IN(i));
-
-6
+no_fan_sensors
-    print_fschmd_fan(name, i, SENSORS_FSCHMD_FAN(i),
-                     SENSORS_FSCHMD_FAN_DIV(i));
-
-5
+no_temp_sensors
-    print_fschmd_temp(name, i, SENSORS_FSCHMD_TEMP(i),
-                      SENSORS_FSCHMD_TEMP_MAX(i));