add w83697hf in7 and in8 support

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1254 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark D. Studebaker committed 2001-11-28 02:50:57 +00:00
1 parent 5fc95cf8b3
commit 8f53105142
3 files changed
+12 -7

No files matched your search

+9 -4
View File
@@ -29,7 +29,7 @@
w83627hf 9 3 2 3 0x20 0x5ca3 yes yes(LPC)
w83782d 9 3 2-4 3 0x30 0x5ca3 yes yes
w83783s 5-6 3 2 1-2 0x40 0x5ca3 yes no
w83697hf 6 2 2 2 0x60 0x5ca3 no yes(LPC)
w83697hf 8 2 2 2 0x60 0x5ca3 no yes(LPC)
*/
@@ -690,7 +690,7 @@ static ctl_table w83783s_dir_table_template[] = {
{0}
};
/* similar to w83783s but no fan3, no vid */
/* similar to w83782d but no fan3, no vid */
static ctl_table w83697hf_dir_table_template[] = {
{W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real,
&i2c_sysctl_real, NULL, &w83781d_in},
@@ -705,6 +705,10 @@ static ctl_table w83697hf_dir_table_template[] = {
&i2c_sysctl_real, NULL, &w83781d_in},
{W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real,
&i2c_sysctl_real, NULL, &w83781d_in},
{W83781D_SYSCTL_IN7, "in7", NULL, 0, 0644, NULL, &i2c_proc_real,
&i2c_sysctl_real, NULL, &w83781d_in},
{W83781D_SYSCTL_IN8, "in8", NULL, 0, 0644, NULL, &i2c_proc_real,
&i2c_sysctl_real, NULL, &w83781d_in},
{W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real,
&i2c_sysctl_real, NULL, &w83781d_fan},
{W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real,
@@ -1352,7 +1356,8 @@ void w83781d_init_client(struct i2c_client *client)
w83781d_write_value(client, W83781D_REG_IN_MAX(6),
IN_TO_REG(W83782D_INIT_IN_MAX_6));
}
if ((type == w83782d) || (type == w83627hf)) {
if ((type == w83782d) || (type == w83627hf) ||
(type == w83697hf)) {
w83781d_write_value(client, W83781D_REG_IN_MIN(7),
IN_TO_REG(W83781D_INIT_IN_MIN_7));
w83781d_write_value(client, W83781D_REG_IN_MAX(7),
@@ -1453,7 +1458,7 @@ void w83781d_update_client(struct i2c_client *client)
data->in_max[i] =
w83781d_read_value(client,
W83781D_REG_IN_MAX(i));
if ((data->type != w83782d)
if ((data->type != w83782d) && (data->type != w83697hf)
&& (data->type != w83627hf) && (i == 6))
break;
}
+1 -1
View File
@@ -2485,7 +2485,7 @@ sensors_chip_features sensors_chip_features_list[] =
{ SENSORS_W83781D_PREFIX, w83781d_features },
{ SENSORS_W83782D_PREFIX, w83782d_features },
{ SENSORS_W83783S_PREFIX, w83783s_features },
{ SENSORS_W83697HF_PREFIX, w83783s_features }, /* same as 783s */
{ SENSORS_W83697HF_PREFIX, w83782d_features }, /* same as 782d */
/* Cheat on 83627HF for now - no separate #defines */
{ SENSORS_W83627HF_PREFIX, w83782d_features },
/* Cheat on 991627HF for now - no separate #defines */
+2 -2
View File
@@ -1919,7 +1919,7 @@ void print_w83781d(const sensors_chip_name *name)
} else
printf("ERROR: Can't get IN5 data!\n");
free_the_label(&label);
if ((!is83s) && (!is697hf)) {
if (1) {
if (!sensors_get_label_and_valid(*name,SENSORS_W83781D_IN6,&label,&valid) &&
!sensors_get_feature(*name,SENSORS_W83781D_IN6,&cur) &&
!sensors_get_feature(*name,SENSORS_W83781D_IN6_MIN,&min) &&
@@ -1934,7 +1934,7 @@ void print_w83781d(const sensors_chip_name *name)
printf("ERROR: Can't get IN6 data!\n");
free_the_label(&label);
}
if (is82d) {
if (is82d || is697hf) {
if (!sensors_get_label_and_valid(*name,SENSORS_W83782D_IN7,&label,&valid) &&
!sensors_get_feature(*name,SENSORS_W83782D_IN7,&cur) &&
!sensors_get_feature(*name,SENSORS_W83782D_IN7_MIN,&min) &&