Navigation

← Previous Changeset
Next Changeset →

Changeset 3246

Timestamp:

01/27/06 22:02:09 (3 years ago)

Author:

ruik

Message:

Add back the temp1 in vt1211, patch from Juerg Haefliger <juergh@gmail.com>

This patch enables the reading of temp1 (Reading3) from the VT1211.
Reading3 returns the V1211's internal temperature.

Files:

lm-sensors/trunk/etc/sensors.conf.eg (modified) (3 diffs)
lm-sensors/trunk/kernel/chips/vt1211.c (modified) (7 diffs)
lm-sensors/trunk/lib/chips.c (modified) (1 diff)
lm-sensors/trunk/lib/chips.h (modified) (1 diff)
lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

lm-sensors/trunk/etc/sensors.conf.eg

r3203	r3246
1924	1924	chip "vt1211-*"
1925	1925	#
1926		# ~~temp1 and in6 are~~ not implemented in vt1211
	1926	# in6 is not implemented in vt1211
1927	1927	#
1928	1928	# 1 for temp, 0 for volt.
…	…
1930	1930	# -------- ------------ --------- --------------
1931	1931	# Reading 1 temp3
	1932	# Reading 3 temp1
1932	1933	# UCH1/Reading2 in0 temp2 0x04 (4)
1933	1934	# UCH2 in1 temp4 0x08 (8)
…	…
1960	1961	label in5 "+3.3V"
1961	1962
	1963	label temp1 "Int Temp"
1962	1964	label temp2 "MB1 Temp"
1963	1965	label temp3 "Proc Temp"

lm-sensors/trunk/kernel/chips/vt1211.c

r3190	r3246
100	100	Sensor Voltage Mode Temp Mode
101	101	-------- ------------ ---------
102		Reading 1 temp3
103		Reading 3 temp1 ~~not in vt1211~~
	102	Reading 1 temp3 Intel thermal diode
	103	Reading 3 temp1 VT1211 internal thermal diode
104	104	UCH1/Reading2 in0 temp2
105	105	UCH2 in1 temp4
…	…
250	250	#define VT1211_SYSCTL_FAN1 1101
251	251	#define VT1211_SYSCTL_FAN2 1102
252		#define VT1211_SYSCTL_TEMP 1200
	252	#define VT1211_SYSCTL_TEMP1 1200
253	253	#define VT1211_SYSCTL_TEMP2 1201
254	254	#define VT1211_SYSCTL_TEMP3 1202
…	…
269	269	#define VT1211_ALARM_IN5 0x04
270	270	#define VT1211_ALARM_IN3 0x08
271		#define VT1211_ALARM_TEMP 0x10
	271	#define VT1211_ALARM_TEMP1 0x10
272	272	#define VT1211_ALARM_FAN1 0x40
273	273	#define VT1211_ALARM_FAN2 0x80
…	…
278	278	#define VT1211_ALARM_TEMP3 0x8000
279	279	/* duplicates */
280		#define VT1211_ALARM_IN0 VT1211_ALARM_TEMP
	280	#define VT1211_ALARM_IN0 VT1211_ALARM_TEMP2
281	281	#define VT1211_ALARM_TEMP4 VT1211_ALARM_IN1
282	282	#define VT1211_ALARM_TEMP5 VT1211_ALARM_IN2
…	…
303	303	{VT1211_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real,
304	304	&i2c_sysctl_real, NULL, &vt1211_in},
305		~~{VT1211_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real,~~
306		~~&i2c_sysctl_real, NULL, &vt1211_temp},~~
307	305	*/
	306	{VT1211_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL,
	307	&i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_temp},
308	308	{VT1211_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL,
309	309	&i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_temp},
…	…
514	514	VT1211_REG_FAN_MIN(i));
515	515	}
516		for (i = 2; i <= 7; i++) {
	516	for (i = 1; i <= 7; i++) {
517	517	if(ISTEMP(i, data->uch_config)) {
518	518	data->temp[i - 1] = vt_rdval(client,
…	…
639	639	{
640	640	struct vt1211_data *data = client->data;
641		int nr = ctl_name - VT1211_SYSCTL_TEMP;
	641	int nr = ctl_name - VT1211_SYSCTL_TEMP1;
642	642
643	643	if (operation == SENSORS_PROC_REAL_INFO)

lm-sensors/trunk/lib/chips.c

r3226	r3246
4537	4537	SENSORS_VT1211_FAN2,
4538	4538	RW, VT1211_SYSCTL_FAN2, VALUE(1), 0 },
4539		/* no temp1 */
	4539	{ SENSORS_VT1211_TEMP1, "temp1", NOMAP, NOMAP,
	4540	R, VT1211_SYSCTL_TEMP1, VALUE(3), 1 },
	4541	{ SENSORS_VT1211_TEMP1_HYST, "temp1_hyst", SENSORS_VT1211_TEMP1,
	4542	SENSORS_VT1211_TEMP1, RW,
	4543	VT1211_SYSCTL_TEMP1, VALUE(2), 1 },
	4544	{ SENSORS_VT1211_TEMP1_OVER, "temp1_over", SENSORS_VT1211_TEMP1,
	4545	SENSORS_VT1211_TEMP1, RW,
	4546	VT1211_SYSCTL_TEMP1, VALUE(1), 1 },
4540	4547	{ SENSORS_VT1211_TEMP2, "temp2", NOMAP, NOMAP,
4541	4548	R, VT1211_SYSCTL_TEMP2, VALUE(3), 1 },

lm-sensors/trunk/lib/chips.h

r3226	r3246
1710	1710	#define SENSORS_VT1211_FAN1_MIN 41 /* RW */
1711	1711	#define SENSORS_VT1211_FAN2_MIN 42 /* RW */
1712		#define SENSORS_VT1211_TEMP 51 /* R */
1713		#define SENSORS_VT1211_TEMP_HYST 52 /* RW */
1714		#define SENSORS_VT1211_TEMP_OVER 53 /* RW */
	1712	#define SENSORS_VT1211_TEMP1 51 /* R */
	1713	#define SENSORS_VT1211_TEMP1_HYST 52 /* RW */
	1714	#define SENSORS_VT1211_TEMP1_OVER 53 /* RW */
1715	1715	#define SENSORS_VT1211_TEMP2 54 /* R */
1716	1716	#define SENSORS_VT1211_TEMP2_HYST 55 /* RW */

lm-sensors/trunk/prog/sensors/chips.c

r3226	r3246
4312	4312	}
4313	4313	free(label);
4314
4315		/* no temp 1 */
	4314	if (sensors_get_label_and_valid(*name,SENSORS_VT1211_TEMP1,&label,&valid)) {
	4315	printf("ERROR: Can't get TEMP1 config!\n");
	4316	} else if (valid) {
	4317	if(!(err = sensors_get_feature(*name,SENSORS_VT1211_TEMP1,&cur)) &&
	4318	!(err = sensors_get_feature(*name,SENSORS_VT1211_TEMP1_HYST,&min)) &&
	4319	!(err = sensors_get_feature(*name,SENSORS_VT1211_TEMP1_OVER,&max))) {
	4320	print_label(label,10);
	4321	print_temp_info( cur, max, min, HYST, 1, 0);
	4322	printf(" %s\n", alarms & VT1211_ALARM_TEMP1 ? "ALARM" : "" );
	4323	} else
	4324	printf("ERROR: Can't get TEMP1 data!\n");
	4325	}
	4326	free(label);
4316	4327	if (sensors_get_label_and_valid(*name,SENSORS_VT1211_TEMP2,&label,&valid)) {
4317	4328	printf("ERROR: Can't get TEMP2 config!\n");