From 5c585957853feea8ebc5c9948dde7a2d2d7ffd7a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 4 Sep 2007 15:15:16 +0000 Subject: [PATCH] libsensors: Fix maxilife support for Linux 2.6. The driver doesn't exist yet, but at least now the library is ready. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4749 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + lib/chips.c | 72 ++++++++++++++++++++++++++--------------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/CHANGES b/CHANGES index fd4da1e4..edfa70bb 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ SVN HEAD Fix bmcsensors support for Linux 2.6 Fix lm93 VID support for Linux 2.6 Fix adm1024 support for Linux 2.6 + Fix maxilife 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) diff --git a/lib/chips.c b/lib/chips.c index 9a97fc07..95a6b5e9 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -2481,37 +2481,37 @@ static sensors_chip_feature maxi_cg_features[] = SENSORS_MAXI_CG_PLL, RW }, MAXI_SYSCTL_PLL, VALUE(2), 2 }, { { SENSORS_MAXI_CG_VID1, "vid1", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID1, VALUE(3), 4 }, + MAXI_SYSCTL_VID1, VALUE(3), 4, "in0_input", 3 }, { { SENSORS_MAXI_CG_VID2, "vid2", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID2, VALUE(3), 4 }, + MAXI_SYSCTL_VID2, VALUE(3), 4, "in1_input", 3 }, { { SENSORS_MAXI_CG_VID3, "vid3", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID3, VALUE(3), 4 }, + MAXI_SYSCTL_VID3, VALUE(3), 4, "in2_input", 3 }, { { SENSORS_MAXI_CG_VID4, "vid4", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID4, VALUE(3), 4 }, + MAXI_SYSCTL_VID4, VALUE(3), 4, "in3_input", 3 }, { { SENSORS_MAXI_CG_VID1_MIN, "vid1_min", SENSORS_MAXI_CG_VID1, SENSORS_MAXI_CG_VID1, RW }, - MAXI_SYSCTL_VID1, VALUE(1), 4 }, + MAXI_SYSCTL_VID1, VALUE(1), 4, "in0_min", 3 }, { { SENSORS_MAXI_CG_VID2_MIN, "vid2_min", SENSORS_MAXI_CG_VID2, SENSORS_MAXI_CG_VID2, RW }, - MAXI_SYSCTL_VID2, VALUE(1), 4 }, + MAXI_SYSCTL_VID2, VALUE(1), 4, "in1_min", 3 }, { { SENSORS_MAXI_CG_VID3_MIN, "vid3_min", SENSORS_MAXI_CG_VID3, SENSORS_MAXI_CG_VID3, RW }, - MAXI_SYSCTL_VID3, VALUE(1), 4 }, + MAXI_SYSCTL_VID3, VALUE(1), 4, "in2_min", 3 }, { { SENSORS_MAXI_CG_VID4_MIN, "vid4_min", SENSORS_MAXI_CG_VID4, SENSORS_MAXI_CG_VID4, RW }, - MAXI_SYSCTL_VID4, VALUE(1), 4 }, + MAXI_SYSCTL_VID4, VALUE(1), 4, "in3_min", 3 }, { { SENSORS_MAXI_CG_VID1_MAX, "vid1_max", SENSORS_MAXI_CG_VID1, SENSORS_MAXI_CG_VID1, RW }, - MAXI_SYSCTL_VID1, VALUE(2), 4 }, + MAXI_SYSCTL_VID1, VALUE(2), 4, "in0_max", 3 }, { { SENSORS_MAXI_CG_VID2_MAX, "vid2_max", SENSORS_MAXI_CG_VID2, SENSORS_MAXI_CG_VID2, RW }, - MAXI_SYSCTL_VID2, VALUE(2), 4 }, + MAXI_SYSCTL_VID2, VALUE(2), 4, "in1_max", 3 }, { { SENSORS_MAXI_CG_VID3_MAX, "vid3_max", SENSORS_MAXI_CG_VID3, SENSORS_MAXI_CG_VID3, RW }, - MAXI_SYSCTL_VID3, VALUE(2), 4 }, + MAXI_SYSCTL_VID3, VALUE(2), 4, "in2_max", 3 }, { { SENSORS_MAXI_CG_VID4_MAX, "vid4_max", SENSORS_MAXI_CG_VID4, SENSORS_MAXI_CG_VID4, RW }, - MAXI_SYSCTL_VID4, VALUE(2), 4 }, + MAXI_SYSCTL_VID4, VALUE(2), 4, "in3_max", 3 }, { { SENSORS_MAXI_CG_ALARMS, "alarms", NOMAP, NOMAP, R }, MAXI_SYSCTL_ALARMS, VALUE(1), 0 }, { { 0 }, 0 } @@ -2589,37 +2589,37 @@ static sensors_chip_feature maxi_co_features[] = SENSORS_MAXI_CO_PLL, RW }, MAXI_SYSCTL_PLL, VALUE(2), 2 }, { { SENSORS_MAXI_CO_VID1, "vid1", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID1, VALUE(3), 4 }, + MAXI_SYSCTL_VID1, VALUE(3), 4, "in0_input", 3 }, { { SENSORS_MAXI_CO_VID2, "vid2", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID2, VALUE(3), 4 }, + MAXI_SYSCTL_VID2, VALUE(3), 4, "in1_input", 3 }, { { SENSORS_MAXI_CO_VID3, "vid3", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID3, VALUE(3), 4 }, + MAXI_SYSCTL_VID3, VALUE(3), 4, "in2_input", 3 }, { { SENSORS_MAXI_CO_VID4, "vid4", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID4, VALUE(3), 4 }, + MAXI_SYSCTL_VID4, VALUE(3), 4, "in3_input", 3 }, { { SENSORS_MAXI_CO_VID1_MIN, "vid1_min", SENSORS_MAXI_CO_VID1, SENSORS_MAXI_CO_VID1, RW }, - MAXI_SYSCTL_VID1, VALUE(1), 4 }, + MAXI_SYSCTL_VID1, VALUE(1), 4, "in0_min", 3 }, { { SENSORS_MAXI_CO_VID2_MIN, "vid2_min", SENSORS_MAXI_CO_VID2, SENSORS_MAXI_CO_VID2, RW }, - MAXI_SYSCTL_VID2, VALUE(1), 4 }, + MAXI_SYSCTL_VID2, VALUE(1), 4, "in1_min", 3 }, { { SENSORS_MAXI_CO_VID3_MIN, "vid3_min", SENSORS_MAXI_CO_VID3, SENSORS_MAXI_CO_VID3, RW }, - MAXI_SYSCTL_VID3, VALUE(1), 4 }, + MAXI_SYSCTL_VID3, VALUE(1), 4, "in2_min", 3 }, { { SENSORS_MAXI_CO_VID4_MIN, "vid4_min", SENSORS_MAXI_CO_VID4, SENSORS_MAXI_CO_VID4, RW }, - MAXI_SYSCTL_VID4, VALUE(1), 4 }, + MAXI_SYSCTL_VID4, VALUE(1), 4, "in3_min", 3 }, { { SENSORS_MAXI_CO_VID1_MAX, "vid1_max", SENSORS_MAXI_CO_VID1, SENSORS_MAXI_CO_VID1, RW }, - MAXI_SYSCTL_VID1, VALUE(2), 4 }, + MAXI_SYSCTL_VID1, VALUE(2), 4, "in0_max", 3 }, { { SENSORS_MAXI_CO_VID2_MAX, "vid2_max", SENSORS_MAXI_CO_VID2, SENSORS_MAXI_CO_VID2, RW }, - MAXI_SYSCTL_VID2, VALUE(2), 4 }, + MAXI_SYSCTL_VID2, VALUE(2), 4, "in1_max", 3 }, { { SENSORS_MAXI_CG_VID3_MAX, "vid3_max", SENSORS_MAXI_CO_VID3, SENSORS_MAXI_CO_VID3, RW }, - MAXI_SYSCTL_VID3, VALUE(2), 4 }, + MAXI_SYSCTL_VID3, VALUE(2), 4, "in2_max", 3 }, { { SENSORS_MAXI_CO_VID4_MAX, "vid4_max", SENSORS_MAXI_CO_VID4, SENSORS_MAXI_CG_VID4, RW }, - MAXI_SYSCTL_VID4, VALUE(2), 4 }, + MAXI_SYSCTL_VID4, VALUE(2), 4, "in3_max", 3 }, { { SENSORS_MAXI_CO_ALARMS, "alarms", NOMAP, NOMAP, R }, MAXI_SYSCTL_ALARMS, VALUE(1), 0 }, { { 0 }, 0 } @@ -2697,37 +2697,37 @@ static sensors_chip_feature maxi_as_features[] = SENSORS_MAXI_AS_PLL, RW }, MAXI_SYSCTL_PLL, VALUE(2), 2 }, { { SENSORS_MAXI_AS_VID1, "vid1", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID1, VALUE(3), 4 }, + MAXI_SYSCTL_VID1, VALUE(3), 4, "in0_input", 3 }, { { SENSORS_MAXI_AS_VID2, "vid2", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID2, VALUE(3), 4 }, + MAXI_SYSCTL_VID2, VALUE(3), 4, "in1_input", 3 }, { { SENSORS_MAXI_AS_VID3, "vid3", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID3, VALUE(3), 4 }, + MAXI_SYSCTL_VID3, VALUE(3), 4, "in2_input", 3 }, { { SENSORS_MAXI_AS_VID4, "vid4", NOMAP, NOMAP, R }, - MAXI_SYSCTL_VID4, VALUE(3), 4 }, + MAXI_SYSCTL_VID4, VALUE(3), 4, "in3_input", 3 }, { { SENSORS_MAXI_AS_VID1_MIN, "vid1_min", SENSORS_MAXI_AS_VID1, SENSORS_MAXI_AS_VID1, RW }, - MAXI_SYSCTL_VID1, VALUE(1), 4 }, + MAXI_SYSCTL_VID1, VALUE(1), 4, "in0_min", 3 }, { { SENSORS_MAXI_AS_VID2_MIN, "vid2_min", SENSORS_MAXI_AS_VID2, SENSORS_MAXI_AS_VID2, RW }, - MAXI_SYSCTL_VID2, VALUE(1), 4 }, + MAXI_SYSCTL_VID2, VALUE(1), 4, "in1_min", 3 }, { { SENSORS_MAXI_AS_VID3_MIN, "vid3_min", SENSORS_MAXI_AS_VID3, SENSORS_MAXI_AS_VID3, RW }, - MAXI_SYSCTL_VID3, VALUE(1), 4 }, + MAXI_SYSCTL_VID3, VALUE(1), 4, "in2_min", 3 }, { { SENSORS_MAXI_AS_VID4_MIN, "vid4_min", SENSORS_MAXI_AS_VID4, SENSORS_MAXI_AS_VID4, RW }, - MAXI_SYSCTL_VID4, VALUE(1), 4 }, + MAXI_SYSCTL_VID4, VALUE(1), 4, "in3_min", 3 }, { { SENSORS_MAXI_AS_VID1_MAX, "vid1_max", SENSORS_MAXI_AS_VID1, SENSORS_MAXI_AS_VID1, RW }, - MAXI_SYSCTL_VID1, VALUE(2), 4 }, + MAXI_SYSCTL_VID1, VALUE(2), 4, "in0_max", 3 }, { { SENSORS_MAXI_AS_VID2_MAX, "vid2_max", SENSORS_MAXI_AS_VID2, SENSORS_MAXI_AS_VID2, RW }, - MAXI_SYSCTL_VID2, VALUE(2), 4 }, + MAXI_SYSCTL_VID2, VALUE(2), 4, "in1_max", 3 }, { { SENSORS_MAXI_AS_VID3_MAX, "vid3_max", SENSORS_MAXI_AS_VID3, SENSORS_MAXI_AS_VID3, RW }, - MAXI_SYSCTL_VID3, VALUE(2), 4 }, + MAXI_SYSCTL_VID3, VALUE(2), 4, "in2_max", 3 }, { { SENSORS_MAXI_AS_VID4_MAX, "vid4_max", SENSORS_MAXI_AS_VID4, SENSORS_MAXI_CG_VID4, RW }, - MAXI_SYSCTL_VID4, VALUE(2), 4 }, + MAXI_SYSCTL_VID4, VALUE(2), 4, "in3_max", 3 }, { { SENSORS_MAXI_AS_ALARMS, "alarms", NOMAP, NOMAP, R }, MAXI_SYSCTL_ALARMS, VALUE(1), 0 }, { { 0 }, 0 }