Fix bmcsensors support for Linux 2.6.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4741 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-09-01 08:26:13 +00:00
1 parent 82197ef51e
commit c519ede6f8
2 files changed
+41 -46

No files matched your search

+1
View File
@@ -5,6 +5,7 @@ SVN HEAD
Library: Fix a memory leak on error
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)
Module i2c-piix4: Add ATI SB700 and SB800 support (2.6 backport)
+40 -46
View File
@@ -5369,13 +5369,13 @@ static sensors_chip_feature vt8231_features[] =
static sensors_chip_feature bmc_features[] =
{
{ { SENSORS_BMC_IN1, "in1", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1, VALUE(3), 3 , "in1_input", 3},
BMC_SYSCTL_IN1, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN, "in1_min", SENSORS_BMC_IN1, SENSORS_BMC_IN1, RW },
BMC_SYSCTL_IN1, VALUE(1), 3 },
{ { SENSORS_BMC_IN1_MAX, "in1_max", SENSORS_BMC_IN1, SENSORS_BMC_IN1, RW },
BMC_SYSCTL_IN1, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+1, "in2", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+1, VALUE(3), 3 , "in2_input", 3},
BMC_SYSCTL_IN1+1, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+1, "in2_min", SENSORS_BMC_IN1+1, SENSORS_BMC_IN1+1,
RW },
BMC_SYSCTL_IN1+1, VALUE(1), 3 },
@@ -5383,7 +5383,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+1, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+2, "in3", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+2, VALUE(3), 3 , "in2_input", 3},
BMC_SYSCTL_IN1+2, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+2, "in3_min", SENSORS_BMC_IN1+2, SENSORS_BMC_IN1+2,
RW },
BMC_SYSCTL_IN1+2, VALUE(1), 3 },
@@ -5391,7 +5391,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+2, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+3, "in4", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+3, VALUE(3), 3 , "in3_input", 3},
BMC_SYSCTL_IN1+3, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+3, "in4_min", SENSORS_BMC_IN1+3, SENSORS_BMC_IN1+3,
RW },
BMC_SYSCTL_IN1+3, VALUE(1), 3 },
@@ -5399,7 +5399,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+3, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+4, "in5", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+4, VALUE(3), 3 , "in4_input", 3},
BMC_SYSCTL_IN1+4, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+4, "in5_min", SENSORS_BMC_IN1+4, SENSORS_BMC_IN1+4,
RW },
BMC_SYSCTL_IN1+4, VALUE(1), 3 },
@@ -5407,7 +5407,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+4, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+5, "in6", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+5, VALUE(3), 3 , "in5_input", 3},
BMC_SYSCTL_IN1+5, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+5, "in6_min", SENSORS_BMC_IN1+5, SENSORS_BMC_IN1+5,
RW },
BMC_SYSCTL_IN1+5, VALUE(1), 3 },
@@ -5415,7 +5415,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+5, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+6, "in7", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+6, VALUE(3), 3 , "in6_input", 3},
BMC_SYSCTL_IN1+6, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+6, "in7_min", SENSORS_BMC_IN1+6, SENSORS_BMC_IN1+6,
RW },
BMC_SYSCTL_IN1+6, VALUE(1), 3 },
@@ -5424,7 +5424,7 @@ static sensors_chip_feature bmc_features[] =
BMC_SYSCTL_IN1+6, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+7, "in8", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+7, VALUE(3), 3 , "in7_input", 3},
BMC_SYSCTL_IN1+7, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+7, "in8_min", SENSORS_BMC_IN1+7, SENSORS_BMC_IN1+7,
RW },
BMC_SYSCTL_IN1+7, VALUE(1), 3 },
@@ -5432,7 +5432,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+7, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+8, "in9", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+8, VALUE(3), 3 , "in8_input", 3},
BMC_SYSCTL_IN1+8, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+8, "in9_min", SENSORS_BMC_IN1+8, SENSORS_BMC_IN1+8,
RW },
BMC_SYSCTL_IN1+8, VALUE(1), 3 },
@@ -5440,7 +5440,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+8, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+9, "in10", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+9, VALUE(3), 3 , "in9_input", 3},
BMC_SYSCTL_IN1+9, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+9, "in10_min", SENSORS_BMC_IN1+9, SENSORS_BMC_IN1+9,
RW },
BMC_SYSCTL_IN1+9, VALUE(1), 3 },
@@ -5448,7 +5448,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_IN1+9, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+10, "in11", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+10, VALUE(3), 3 , "in10_input", 3},
BMC_SYSCTL_IN1+10, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+10, "in11_min", SENSORS_BMC_IN1+10,
SENSORS_BMC_IN1+10, RW },
BMC_SYSCTL_IN1+10, VALUE(1), 3 },
@@ -5456,7 +5456,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+10, RW },
BMC_SYSCTL_IN1+10, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+11, "in12", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+11, VALUE(3), 3 , "in11_input", 3},
BMC_SYSCTL_IN1+11, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+11, "in12_min", SENSORS_BMC_IN1+11,
SENSORS_BMC_IN1+11, RW },
BMC_SYSCTL_IN1+11, VALUE(1), 3 },
@@ -5464,7 +5464,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+11, RW },
BMC_SYSCTL_IN1+11, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+12, "in13", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+12, VALUE(3), 3 , "in12_input", 3},
BMC_SYSCTL_IN1+12, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+12, "in13_min", SENSORS_BMC_IN1+12,
SENSORS_BMC_IN1+12, RW },
BMC_SYSCTL_IN1+12, VALUE(1), 3 },
@@ -5472,7 +5472,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+12, RW },
BMC_SYSCTL_IN1+12, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+13, "in14", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+13, VALUE(3), 3 , "in13_input", 3},
BMC_SYSCTL_IN1+13, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+13, "in14_min", SENSORS_BMC_IN1+13,
SENSORS_BMC_IN1+13, RW },
BMC_SYSCTL_IN1+13, VALUE(1), 3 },
@@ -5480,7 +5480,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+13, RW },
BMC_SYSCTL_IN1+13, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+14, "in15", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+14, VALUE(3), 3 , "in14_input", 3},
BMC_SYSCTL_IN1+14, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+14, "in15_min", SENSORS_BMC_IN1+14,
SENSORS_BMC_IN1+14, RW },
BMC_SYSCTL_IN1+14, VALUE(1), 3 },
@@ -5488,7 +5488,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+14, RW },
BMC_SYSCTL_IN1+14, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+15, "in16", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+15, VALUE(3), 3 , "in15_input", 3},
BMC_SYSCTL_IN1+15, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+15, "in16_min", SENSORS_BMC_IN1+15,
SENSORS_BMC_IN1+15, RW },
BMC_SYSCTL_IN1+15, VALUE(1), 3 },
@@ -5496,7 +5496,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+15, RW },
BMC_SYSCTL_IN1+15, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+16, "in17", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+16, VALUE(3), 3 , "in16_input", 3},
BMC_SYSCTL_IN1+16, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+16, "in17_min", SENSORS_BMC_IN1+16,
SENSORS_BMC_IN1+16, RW },
BMC_SYSCTL_IN1+16, VALUE(1), 3 },
@@ -5504,7 +5504,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+16, RW },
BMC_SYSCTL_IN1+16, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+17, "in18", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+17, VALUE(3), 3, "in17_input", 3 },
BMC_SYSCTL_IN1+17, VALUE(3), 3, },
{ { SENSORS_BMC_IN1_MIN+17, "in18_min", SENSORS_BMC_IN1+17,
SENSORS_BMC_IN1+17, RW },
BMC_SYSCTL_IN1+17, VALUE(1), 3 },
@@ -5512,7 +5512,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+17, RW },
BMC_SYSCTL_IN1+17, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+18, "in19", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+18, VALUE(3), 3 , "in18_input", 3},
BMC_SYSCTL_IN1+18, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+18, "in19_min", SENSORS_BMC_IN1+18,
SENSORS_BMC_IN1+18, RW },
BMC_SYSCTL_IN1+18, VALUE(1), 3 },
@@ -5520,7 +5520,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+18, RW },
BMC_SYSCTL_IN1+18, VALUE(2), 3 },
{ { SENSORS_BMC_IN1+19, "in20", NOMAP, NOMAP, R },
BMC_SYSCTL_IN1+19, VALUE(3), 3 , "in19_input", 3},
BMC_SYSCTL_IN1+19, VALUE(3), 3 },
{ { SENSORS_BMC_IN1_MIN+19, "in20_min", SENSORS_BMC_IN1+19,
SENSORS_BMC_IN1+19, RW },
BMC_SYSCTL_IN1+19, VALUE(1), 3 },
@@ -5528,25 +5528,25 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_IN1+19, RW },
BMC_SYSCTL_IN1+19, VALUE(2), 3 },
{ { SENSORS_BMC_FAN1, "fan1", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1, VALUE(2), 0, "fan1_input", 0},
BMC_SYSCTL_FAN1, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+1, "fan2", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+1, VALUE(2), 0, "fan2_input", 0 },
BMC_SYSCTL_FAN1+1, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+2, "fan3", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+2, VALUE(2), 0, "fan3_input", 0 },
BMC_SYSCTL_FAN1+2, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+3, "fan4", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+3, VALUE(2), 0, "fan4_input", 0 },
BMC_SYSCTL_FAN1+3, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+4, "fan5", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+4, VALUE(2), 0, "fan5_input", 0 },
BMC_SYSCTL_FAN1+4, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+5, "fan6", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+5, VALUE(2), 0, "fan6_input", 0 },
BMC_SYSCTL_FAN1+5, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+6, "fan7", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+6, VALUE(2), 0, "fan7_input", 0 },
BMC_SYSCTL_FAN1+6, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+7, "fan8", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+7, VALUE(2), 0, "fan8_input", 0 },
BMC_SYSCTL_FAN1+7, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+8, "fan9", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+8, VALUE(2), 0, "fan9_input", 0 },
BMC_SYSCTL_FAN1+8, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1+9, "fan10", NOMAP, NOMAP, R },
BMC_SYSCTL_FAN1+9, VALUE(2), 0, "fan10_input", 0 },
BMC_SYSCTL_FAN1+9, VALUE(2), 0, },
{ { SENSORS_BMC_FAN1_MIN, "fan1_min", SENSORS_BMC_FAN1, SENSORS_BMC_FAN1, RW },
BMC_SYSCTL_FAN1, VALUE(1), 0 },
{ { SENSORS_BMC_FAN1_MIN+1, "fan2_min", SENSORS_BMC_FAN1+1,
@@ -5577,7 +5577,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_FAN1+9, RW },
BMC_SYSCTL_FAN1+9, VALUE(1), 0 },
{ { SENSORS_BMC_TEMP1, "temp1", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1, VALUE(3), 2 , "temp1_input", 3 },
BMC_SYSCTL_TEMP1, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN, "temp1_min", SENSORS_BMC_TEMP1, SENSORS_BMC_TEMP1,
RW },
BMC_SYSCTL_TEMP1, VALUE(2), 2 },
@@ -5585,8 +5585,7 @@ static sensors_chip_feature bmc_features[] =
RW },
BMC_SYSCTL_TEMP1, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+1, "temp2", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+1, VALUE(3), 2 , "temp2_input",
2 },
BMC_SYSCTL_TEMP1+1, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+1, "temp2_min", SENSORS_BMC_TEMP1+1,
SENSORS_BMC_TEMP1+1, RW },
BMC_SYSCTL_TEMP1+1, VALUE(2), 2 },
@@ -5594,8 +5593,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+1, RW },
BMC_SYSCTL_TEMP1+1, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+2, "temp3", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+2, VALUE(3), 2 , "temp3_input",
2 },
BMC_SYSCTL_TEMP1+2, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+2, "temp3_min", SENSORS_BMC_TEMP1+2,
SENSORS_BMC_TEMP1+2, RW },
BMC_SYSCTL_TEMP1+2, VALUE(2), 2 },
@@ -5603,7 +5601,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+2, RW },
BMC_SYSCTL_TEMP1+2, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+3, "temp4", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+3, VALUE(3), 2, "temp4_input", 2 },
BMC_SYSCTL_TEMP1+3, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+3, "temp4_min", SENSORS_BMC_TEMP1+3,
SENSORS_BMC_TEMP1+3, RW },
BMC_SYSCTL_TEMP1+3, VALUE(2), 2 },
@@ -5611,7 +5609,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+3, RW },
BMC_SYSCTL_TEMP1+3, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+4, "temp5", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+4, VALUE(3), 2, "temp5_input", 2 },
BMC_SYSCTL_TEMP1+4, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+4, "temp5_min", SENSORS_BMC_TEMP1+4,
SENSORS_BMC_TEMP1+4, RW },
BMC_SYSCTL_TEMP1+4, VALUE(2), 2 },
@@ -5619,7 +5617,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+4, RW },
BMC_SYSCTL_TEMP1+4, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+5, "temp6", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+5, VALUE(3), 2, "temp6_input", 2 },
BMC_SYSCTL_TEMP1+5, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+5, "temp6_min", SENSORS_BMC_TEMP1+5,
SENSORS_BMC_TEMP1+5, RW },
BMC_SYSCTL_TEMP1+5, VALUE(2), 2 },
@@ -5627,8 +5625,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+5, RW },
BMC_SYSCTL_TEMP1+5, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+6, "temp7", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+6, VALUE(3), 2, "temp7_input",
2 },
BMC_SYSCTL_TEMP1+6, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+6, "temp7_min", SENSORS_BMC_TEMP1+6,
SENSORS_BMC_TEMP1+6, RW },
BMC_SYSCTL_TEMP1+6, VALUE(2), 2 },
@@ -5636,8 +5633,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+6, RW },
BMC_SYSCTL_TEMP1+6, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+7, "temp8", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+7, VALUE(3), 2, "temp8_input",
2 },
BMC_SYSCTL_TEMP1+7, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+7, "temp8_min", SENSORS_BMC_TEMP1+7,
SENSORS_BMC_TEMP1+7, RW },
BMC_SYSCTL_TEMP1+7, VALUE(2), 2 },
@@ -5645,8 +5641,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+7, RW },
BMC_SYSCTL_TEMP1+7, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+8, "temp9", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+8, VALUE(3), 2, "temp9_input",
2 },
BMC_SYSCTL_TEMP1+8, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+8, "temp9_min", SENSORS_BMC_TEMP1+8,
SENSORS_BMC_TEMP1+8, RW },
BMC_SYSCTL_TEMP1+8, VALUE(2), 2 },
@@ -5654,8 +5649,7 @@ static sensors_chip_feature bmc_features[] =
SENSORS_BMC_TEMP1+8, RW },
BMC_SYSCTL_TEMP1+8, VALUE(1), 2 },
{ { SENSORS_BMC_TEMP1+9, "temp10", NOMAP, NOMAP, R },
BMC_SYSCTL_TEMP1+9, VALUE(3), 2, "temp10_input",
2 },
BMC_SYSCTL_TEMP1+9, VALUE(3), 2 },
{ { SENSORS_BMC_TEMP1_MIN+9, "temp10_min", SENSORS_BMC_TEMP1+9,
SENSORS_BMC_TEMP1+9, RW },
BMC_SYSCTL_TEMP1+9, VALUE(2), 2 },