Changeset 4741

Timestamp:

09/01/07 10:26:13 (1 year ago)

Author:

khali

Message:

Fix bmcsensors support for Linux 2.6.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/lib/chips.c (modified) (31 diffs)

lm-sensors/trunk/CHANGES

@@ -6 +6 @@
-           Speed up sensors_get_ignored() a bit
-           Fix thmc50 support for Linux 2.6
+           Fix bmcsensors support for Linux 2.6
-  Makefile: Fix kernel version detection (#2187)
-  Module fscher: Add missing read of control register (2.6 backport)

lm-sensors/trunk/lib/chips.c

@@ -5370 +5370 @@
-  { 
-    { { SENSORS_BMC_IN1, "in1", NOMAP, NOMAP, R }, 
-, "in1_input", 3
+
-    { { SENSORS_BMC_IN1_MIN, "in1_min", SENSORS_BMC_IN1, SENSORS_BMC_IN1, RW }, 
-                             BMC_SYSCTL_IN1, VALUE(1), 3 },
@@ -5376 +5376 @@
-                             BMC_SYSCTL_IN1, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+1, "in2", NOMAP, NOMAP, R }, 
-, "in2_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+1, "in2_min", SENSORS_BMC_IN1+1, SENSORS_BMC_IN1+1, 
-                               RW }, 
@@ -5384 +5384 @@
-                               BMC_SYSCTL_IN1+1, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+2, "in3", NOMAP, NOMAP, R }, 
-, "in2_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+2, "in3_min", SENSORS_BMC_IN1+2, SENSORS_BMC_IN1+2, 
-                               RW }, 
@@ -5392 +5392 @@
-                               BMC_SYSCTL_IN1+2, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+3, "in4", NOMAP, NOMAP, R }, 
-, "in3_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+3, "in4_min", SENSORS_BMC_IN1+3, SENSORS_BMC_IN1+3, 
-                               RW }, 
@@ -5400 +5400 @@
-                               BMC_SYSCTL_IN1+3, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+4, "in5", NOMAP, NOMAP, R }, 
-, "in4_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+4, "in5_min", SENSORS_BMC_IN1+4, SENSORS_BMC_IN1+4, 
-                               RW }, 
@@ -5408 +5408 @@
-                               BMC_SYSCTL_IN1+4, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+5, "in6", NOMAP, NOMAP, R }, 
-, "in5_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+5, "in6_min", SENSORS_BMC_IN1+5, SENSORS_BMC_IN1+5, 
-                               RW }, 
@@ -5416 +5416 @@
-                               BMC_SYSCTL_IN1+5, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+6, "in7", NOMAP, NOMAP, R }, 
-, "in6_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+6, "in7_min", SENSORS_BMC_IN1+6, SENSORS_BMC_IN1+6, 
-                               RW }, 
@@ -5425 +5425 @@
-
-    { { SENSORS_BMC_IN1+7, "in8", NOMAP, NOMAP, R }, 
-, "in7_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+7, "in8_min", SENSORS_BMC_IN1+7, SENSORS_BMC_IN1+7, 
-                               RW }, 
@@ -5433 +5433 @@
-                               BMC_SYSCTL_IN1+7, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+8, "in9", NOMAP, NOMAP, R }, 
-, "in8_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+8, "in9_min", SENSORS_BMC_IN1+8, SENSORS_BMC_IN1+8, 
-                               RW }, 
@@ -5441 +5441 @@
-                               BMC_SYSCTL_IN1+8, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+9, "in10", NOMAP, NOMAP, R }, 
-, "in9_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+9, "in10_min", SENSORS_BMC_IN1+9, SENSORS_BMC_IN1+9, 
-                               RW }, 
@@ -5449 +5449 @@
-                               BMC_SYSCTL_IN1+9, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+10, "in11", NOMAP, NOMAP, R }, 
-, "in10_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+10, "in11_min", SENSORS_BMC_IN1+10, 
-                                SENSORS_BMC_IN1+10, RW }, 
@@ -5457 +5457 @@
-                                BMC_SYSCTL_IN1+10, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+11, "in12", NOMAP, NOMAP, R }, 
-, "in11_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+11, "in12_min", SENSORS_BMC_IN1+11, 
-                                SENSORS_BMC_IN1+11, RW }, 
@@ -5465 +5465 @@
-                                BMC_SYSCTL_IN1+11, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+12, "in13", NOMAP, NOMAP, R }, 
-, "in12_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+12, "in13_min", SENSORS_BMC_IN1+12, 
-                                SENSORS_BMC_IN1+12, RW }, 
@@ -5473 +5473 @@
-                                BMC_SYSCTL_IN1+12, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+13, "in14", NOMAP, NOMAP, R }, 
-, "in13_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+13, "in14_min", SENSORS_BMC_IN1+13, 
-                                SENSORS_BMC_IN1+13, RW }, 
@@ -5481 +5481 @@
-                                BMC_SYSCTL_IN1+13, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+14, "in15", NOMAP, NOMAP, R }, 
-, "in14_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+14, "in15_min", SENSORS_BMC_IN1+14, 
-                                SENSORS_BMC_IN1+14, RW }, 
@@ -5489 +5489 @@
-                                BMC_SYSCTL_IN1+14, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+15, "in16", NOMAP, NOMAP, R }, 
-, "in15_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+15, "in16_min", SENSORS_BMC_IN1+15, 
-                                SENSORS_BMC_IN1+15, RW }, 
@@ -5497 +5497 @@
-                                BMC_SYSCTL_IN1+15, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+16, "in17", NOMAP, NOMAP, R }, 
-, "in16_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+16, "in17_min", SENSORS_BMC_IN1+16, 
-                                SENSORS_BMC_IN1+16, RW }, 
@@ -5505 +5505 @@
-                                BMC_SYSCTL_IN1+16, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+17, "in18", NOMAP, NOMAP, R }, 
-"in17_input", 3 
+
-    { { SENSORS_BMC_IN1_MIN+17, "in18_min", SENSORS_BMC_IN1+17, 
-                                SENSORS_BMC_IN1+17, RW }, 
@@ -5513 +5513 @@
-                                BMC_SYSCTL_IN1+17, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+18, "in19", NOMAP, NOMAP, R }, 
-, "in18_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+18, "in19_min", SENSORS_BMC_IN1+18, 
-                                SENSORS_BMC_IN1+18, RW }, 
@@ -5521 +5521 @@
-                                BMC_SYSCTL_IN1+18, VALUE(2), 3 },
-    { { SENSORS_BMC_IN1+19, "in20", NOMAP, NOMAP, R }, 
-, "in19_input", 3
+
-    { { SENSORS_BMC_IN1_MIN+19, "in20_min", SENSORS_BMC_IN1+19, 
-                                SENSORS_BMC_IN1+19, RW }, 
@@ -5529 +5529 @@
-                                BMC_SYSCTL_IN1+19, VALUE(2), 3 },
-    { { SENSORS_BMC_FAN1, "fan1", NOMAP, NOMAP, R }, 
-"fan1_input", 0
+
-    { { SENSORS_BMC_FAN1+1, "fan2", NOMAP, NOMAP, R }, 
-"fan2_input", 0 
+
-    { { SENSORS_BMC_FAN1+2, "fan3", NOMAP, NOMAP, R }, 
-"fan3_input", 0 
+
-    { { SENSORS_BMC_FAN1+3, "fan4", NOMAP, NOMAP, R }, 
-"fan4_input", 0 
+
-    { { SENSORS_BMC_FAN1+4, "fan5", NOMAP, NOMAP, R }, 
-"fan5_input", 0 
+
-    { { SENSORS_BMC_FAN1+5, "fan6", NOMAP, NOMAP, R }, 
-"fan6_input", 0 
+
-    { { SENSORS_BMC_FAN1+6, "fan7", NOMAP, NOMAP, R }, 
-"fan7_input", 0 
+
-    { { SENSORS_BMC_FAN1+7, "fan8", NOMAP, NOMAP, R }, 
-"fan8_input", 0 
+
-    { { SENSORS_BMC_FAN1+8, "fan9", NOMAP, NOMAP, R }, 
-"fan9_input", 0 
+
-    { { SENSORS_BMC_FAN1+9, "fan10", NOMAP, NOMAP, R }, 
-"fan10_input", 0 
+
-    { { SENSORS_BMC_FAN1_MIN, "fan1_min", SENSORS_BMC_FAN1, SENSORS_BMC_FAN1, RW }, 
-                              BMC_SYSCTL_FAN1, VALUE(1), 0 },
@@ -5578 +5578 @@
-                                BMC_SYSCTL_FAN1+9, VALUE(1), 0 },
-    { { SENSORS_BMC_TEMP1, "temp1", NOMAP, NOMAP, R }, 
-, "temp1_input", 3 
+
-    { { SENSORS_BMC_TEMP1_MIN, "temp1_min", SENSORS_BMC_TEMP1, SENSORS_BMC_TEMP1, 
-                               RW }, 
@@ -5586 +5586 @@
-                               BMC_SYSCTL_TEMP1, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+1, "temp2", NOMAP, NOMAP, R }, 
-
-
+
-    { { SENSORS_BMC_TEMP1_MIN+1, "temp2_min", SENSORS_BMC_TEMP1+1, 
-                                 SENSORS_BMC_TEMP1+1, RW }, 
@@ -5595 +5594 @@
-                                 BMC_SYSCTL_TEMP1+1, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+2, "temp3", NOMAP, NOMAP, R }, 
-
-
+
-    { { SENSORS_BMC_TEMP1_MIN+2, "temp3_min", SENSORS_BMC_TEMP1+2, 
-                                 SENSORS_BMC_TEMP1+2, RW }, 
@@ -5604 +5602 @@
-                                 BMC_SYSCTL_TEMP1+2, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+3, "temp4", NOMAP, NOMAP, R }, 
-, "temp4_input", 2
+
-    { { SENSORS_BMC_TEMP1_MIN+3, "temp4_min", SENSORS_BMC_TEMP1+3, 
-                                 SENSORS_BMC_TEMP1+3, RW }, 
@@ -5612 +5610 @@
-                                 BMC_SYSCTL_TEMP1+3, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+4, "temp5", NOMAP, NOMAP, R }, 
-, "temp5_input", 2
+
-    { { SENSORS_BMC_TEMP1_MIN+4, "temp5_min", SENSORS_BMC_TEMP1+4, 
-                                 SENSORS_BMC_TEMP1+4, RW }, 
@@ -5620 +5618 @@
-                                 BMC_SYSCTL_TEMP1+4, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+5, "temp6", NOMAP, NOMAP, R }, 
-, "temp6_input", 2
+
-    { { SENSORS_BMC_TEMP1_MIN+5, "temp6_min", SENSORS_BMC_TEMP1+5, 
-                                 SENSORS_BMC_TEMP1+5, RW }, 
@@ -5628 +5626 @@
-                                 BMC_SYSCTL_TEMP1+5, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+6, "temp7", NOMAP, NOMAP, R }, 
-
-
+
-    { { SENSORS_BMC_TEMP1_MIN+6, "temp7_min", SENSORS_BMC_TEMP1+6, 
-                                 SENSORS_BMC_TEMP1+6, RW }, 
@@ -5637 +5634 @@
-                                 BMC_SYSCTL_TEMP1+6, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+7, "temp8", NOMAP, NOMAP, R }, 
-
-
+
-    { { SENSORS_BMC_TEMP1_MIN+7, "temp8_min", SENSORS_BMC_TEMP1+7, 
-                                 SENSORS_BMC_TEMP1+7, RW }, 
@@ -5646 +5642 @@
-                                 BMC_SYSCTL_TEMP1+7, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+8, "temp9", NOMAP, NOMAP, R }, 
-
-
+
-    { { SENSORS_BMC_TEMP1_MIN+8, "temp9_min", SENSORS_BMC_TEMP1+8, 
-                                 SENSORS_BMC_TEMP1+8, RW }, 
@@ -5655 +5650 @@
-                                 BMC_SYSCTL_TEMP1+8, VALUE(1), 2 },
-    { { SENSORS_BMC_TEMP1+9, "temp10", NOMAP, NOMAP, R }, 
-
-
+
-    { { SENSORS_BMC_TEMP1_MIN+9, "temp10_min", SENSORS_BMC_TEMP1+9, 
-                                 SENSORS_BMC_TEMP1+9, RW },