From 3deac652ba7357b9690133add245cff714f75fe5 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 20 Jan 2005 19:52:38 +0000 Subject: [PATCH] Support the Linux 2.6 fscpos driver. Patch from Stefan Ott. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2856 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/chips.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/chips.c b/lib/chips.c index 8fa1c3c2..9337a99c 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -4017,12 +4017,11 @@ static sensors_chip_feature fscpos_features[] = { SENSORS_FSCPOS_CONTROL, "control", NOMAP, NOMAP, RW, FSCPOS_SYSCTL_CONTROL, VALUE(1), 0 }, { SENSORS_FSCPOS_VOLTAGE1, "volt12", NOMAP, NOMAP, - R, FSCPOS_SYSCTL_VOLT0, VALUE(1), 2 }, + R, FSCPOS_SYSCTL_VOLT0, VALUE(1), 2, "in0_input", 3 }, { SENSORS_FSCPOS_VOLTAGE2, "volt5", NOMAP, NOMAP, - R, FSCPOS_SYSCTL_VOLT1, VALUE(1), 2 }, - { SENSORS_FSCPOS_VOLTAGE3, "voltbatt", NOMAP, - NOMAP, R, - FSCPOS_SYSCTL_VOLT2, VALUE(1), 2 }, + R, FSCPOS_SYSCTL_VOLT1, VALUE(1), 2, "in1_input", 3 }, + { SENSORS_FSCPOS_VOLTAGE3, "voltbatt", NOMAP, NOMAP, + R, FSCPOS_SYSCTL_VOLT2, VALUE(1), 2, "in2_input", 3 }, { SENSORS_FSCPOS_TEMP1, "temp1", NOMAP, NOMAP, R, FSCPOS_SYSCTL_TEMP0, VALUE(2), 0 }, { SENSORS_FSCPOS_TEMP2, "temp2", NOMAP, NOMAP, @@ -4046,10 +4045,10 @@ static sensors_chip_feature fscpos_features[] = R, FSCPOS_SYSCTL_FAN2, VALUE(4), 0 }, { SENSORS_FSCPOS_FAN1_MIN, "fan1_min", SENSORS_FSCPOS_FAN1, SENSORS_FSCPOS_FAN1, RW, - FSCPOS_SYSCTL_FAN0, VALUE(2), 0 }, + FSCPOS_SYSCTL_FAN0, VALUE(2), 0, "pwm1", 0 }, { SENSORS_FSCPOS_FAN2_MIN, "fan2_min", SENSORS_FSCPOS_FAN2, SENSORS_FSCPOS_FAN2, RW, - FSCPOS_SYSCTL_FAN1, VALUE(2), 0 }, + FSCPOS_SYSCTL_FAN1, VALUE(2), 0, "pwm2", 0 }, { SENSORS_FSCPOS_FAN1_STATE, "fan1_state", SENSORS_FSCPOS_FAN1, SENSORS_FSCPOS_FAN1, RW, FSCPOS_SYSCTL_FAN0, VALUE(1), 0 },