Changeset 2670
- Timestamp:
- 08/23/04 20:44:15 (4 years ago)
- Files:
-
- lm-sensors/trunk/etc/sensors.conf.eg (modified) (2 diffs)
- lm-sensors/trunk/lib/chips.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lm-sensors/trunk/etc/sensors.conf.eg
r2668 r2670 1236 1236 # be overridden here. 1237 1237 # 1238 # Note: AIN1 (-12?), AIN2 (-5?) and CPU2_temprequire changing1238 # Note: AIN1 (-12?), AIN2 (-5?) and temp3 require changing 1239 1239 # #defines in the driver and recompiling!!! 1240 # This does not apply to the Linux 2.6 driver. 1240 1241 # 1241 1242 # This chip has non-standard entries in lib/chips.c so … … 1251 1252 # Warning - feature names starting with a number must be enclosed 1252 1253 # with double quotes. 1253 # 1254 # It is unlikely you will need to use the following 6 lines (see above) 1255 # label "2.5V" "xxx" 1256 # label Vccp1 "xxx" 1257 # label "3.3V" "xxx" 1258 # label "5V" "xxx" 1259 # label "12V" "xxx" 1260 # label Vccp2 "xxx" 1261 1262 # label fan1 "xxx" 1263 # label fan2 "xxx" 1264 # label temp1 "xxx" 1265 # label CPU_Temp "xxx" 1266 # label CPU2_Temp "xxx" 1267 # 1268 # set AmbTemp_min xxx 1269 # set Vccp1_min xxx 1270 # set "3.3V_min" xxx 1271 # set "5V_min" xxx 1272 # set "12V_min" xxx 1273 # set Vccp2_min xxx 1274 # 1275 # set AmbTemp_max xxx 1276 # set Vccp1_max xxx 1277 # set "3.3V_max" xxx 1278 # set "5V_max" xxx 1279 # set "12V_max" xxx 1280 # set Vccp2_max xxx 1281 # 1282 # set fan1_div xxx 1283 # set fan2_div xxx 1284 # set fan1_min xxx 1285 # set fan2_min xxx 1286 # set temp1_min xxx 1287 # set temp1_max xxx 1288 # set temp2_min xxx 1289 # set temp2_max xxx 1290 # set temp3_min xxx 1291 # set temp3_max xxx 1292 1293 # It is unlikely you will need to use the following 6 lines (see above) 1294 # compute "2.5V" xxx 1295 # compute Vccp1 xxx 1296 # compute "3.3V" xxx 1297 # compute "5V" xxx 1298 # compute "12V" xxx 1299 # compute Vccp2 xxx 1300 1301 # compute temp1 xxx 1302 # compute CPU_Temp xxx 1303 # compute CPU2_Temp xxx 1254 1255 label "2.5V" "+2.5V" 1256 label Vccp1 "VCore" 1257 label "3.3V" "+3.3V" 1258 label "5V" "+5V" 1259 label "12V" "+12V" 1260 # label Vccp2 "VCore2" 1261 1262 label fan1 "CPU Fan" 1263 # label fan2 "Case Fan" 1264 label temp1 "M/B Temp" 1265 label CPU_Temp "CPU Temp" 1266 # label temp3 "AUX Temp" 1267 1268 set Vccp1_min vid * 0.95 1269 set Vccp1_max vid * 1.05 1270 set "3.3V_min" 3.3 * 0.92 1271 set "3.3V_max" 3.3 * 1.08 1272 set "5V_min" 5 * 0.92 1273 set "5V_max" 5 * 1.08 1274 set "12V_min" 12 * 0.90 1275 set "12V_max" 12 * 1.10 1276 1277 # These ones are mutually exclusive with temp3. If you have temp3, 1278 # comment out these lines as they will trigger errors on "sensors -s". 1279 set "2.5V_min" 2.5 * 0.92 1280 set "2.5V_max" 2.5 * 1.08 1281 set Vccp2_min vid * 0.95 1282 set Vccp2_max vid * 1.05 1283 1284 # Increase fan clock dividers if your fans read 0 RPM while you know 1285 # they are connected and running. 1286 # set fan1_div 4 1287 # set fan2_div 4 1288 1289 set fan1_min 3000 1290 set fan2_min 3000 1291 1292 set temp1_min 5 1293 set temp1_max 65 1294 set temp2_min 5 1295 set temp2_max 70 1296 1297 # Uncomment if you actually have temp3 (which means you don't have 2.5V 1298 # nor Vccp2, as they are mutually exclusive). 1299 # set temp3_min 5 1300 # set temp3_max 70 1304 1301 1305 1302 # LM87 AIN1 and AIN2 Section lm-sensors/trunk/lib/chips.c
r2655 r2670 3620 3620 R, LM87_SYSCTL_IN5, VALUE(3), 2, "in5_input", 3 }, 3621 3621 { SENSORS_LM87_AIN1, "AIN1", NOMAP, NOMAP, 3622 R, LM87_SYSCTL_AIN1, VALUE(3), 0 },3622 R, LM87_SYSCTL_AIN1, VALUE(3), 0, "in6_input", 3 }, 3623 3623 { SENSORS_LM87_AIN2, "AIN2", NOMAP, NOMAP, 3624 R, LM87_SYSCTL_AIN2, VALUE(3), 0 },3625 { SENSORS_LM87_IN0_MIN, " AmbTemp_min", SENSORS_LM87_IN0,3624 R, LM87_SYSCTL_AIN2, VALUE(3), 0, "in7_input", 3 }, 3625 { SENSORS_LM87_IN0_MIN, "2.5V_min", SENSORS_LM87_IN0, 3626 3626 SENSORS_LM87_IN0, RW, 3627 3627 LM87_SYSCTL_IN0, VALUE(1), 2, "in0_min", 3 }, … … 3643 3643 { SENSORS_LM87_AIN1_MIN, "AIN1_min", SENSORS_LM87_AIN1, 3644 3644 SENSORS_LM87_AIN1, RW, 3645 LM87_SYSCTL_AIN1, VALUE(1), 0 },3645 LM87_SYSCTL_AIN1, VALUE(1), 0, "in6_min", 3 }, 3646 3646 { SENSORS_LM87_AIN2_MIN, "AIN2_min", SENSORS_LM87_AIN2, 3647 3647 SENSORS_LM87_AIN2, RW, 3648 LM87_SYSCTL_AIN2, VALUE(1), 0 },3649 { SENSORS_LM87_IN0_MAX, " AmbTemp_max", SENSORS_LM87_IN0,3648 LM87_SYSCTL_AIN2, VALUE(1), 0, "in7_min", 3 }, 3649 { SENSORS_LM87_IN0_MAX, "2.5V_max", SENSORS_LM87_IN0, 3650 3650 SENSORS_LM87_IN0, RW, 3651 3651 LM87_SYSCTL_IN0, VALUE(2), 2, "in0_max", 3 }, … … 3667 3667 { SENSORS_LM87_AIN1_MAX, "AIN1_max", SENSORS_LM87_AIN1, 3668 3668 SENSORS_LM87_AIN1, RW, 3669 LM87_SYSCTL_AIN1, VALUE(2), 0 },3669 LM87_SYSCTL_AIN1, VALUE(2), 0, "in6_max", 3 }, 3670 3670 { SENSORS_LM87_AIN2_MAX, "AIN2_max", SENSORS_LM87_AIN2, 3671 3671 SENSORS_LM87_AIN2, RW, 3672 LM87_SYSCTL_AIN2, VALUE(2), 0 },3672 LM87_SYSCTL_AIN2, VALUE(2), 0, "in7_max", 3 }, 3673 3673 { SENSORS_LM87_FAN1, "fan1", NOMAP, NOMAP, 3674 3674 R, LM87_SYSCTL_FAN1, VALUE(2), 0 }, … … 3681 3681 SENSORS_LM87_FAN2, RW, 3682 3682 LM87_SYSCTL_FAN2, VALUE(1), 0 }, 3683 { SENSORS_LM87_TEMP3, " CPU2_Temp", NOMAP, NOMAP,3684 R, LM87_SYSCTL_TEMP3, VALUE(3), 1 , "temp3_input", 3},3683 { SENSORS_LM87_TEMP3, "temp3", NOMAP, NOMAP, 3684 R, LM87_SYSCTL_TEMP3, VALUE(3), 1 }, 3685 3685 { SENSORS_LM87_TEMP2, "CPU_Temp", NOMAP, NOMAP, 3686 3686 R, LM87_SYSCTL_TEMP2, VALUE(3), 1, "temp2_input", 3 }, … … 3720 3720 { SENSORS_LM87_ANALOG_OUT, "analog_out", NOMAP, 3721 3721 NOMAP, RW, 3722 LM87_SYSCTL_ANALOG_OUT, VALUE(1), 0 },3722 LM87_SYSCTL_ANALOG_OUT, VALUE(1), 0 , "aout_output", 3 }, 3723 3723 { 0 } 3724 3724 };
