diff --git a/lib/chips.c b/lib/chips.c index 3f9409fe..12073729 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -818,7 +818,7 @@ static sensors_chip_feature w83781d_features[] = R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 }, { SENSORS_W83781D_TEMP1_HYST, "temp1_hyst", SENSORS_W83781D_TEMP1, SENSORS_W83781D_TEMP1, RW, - W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_min1", 2 }, + W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 }, { SENSORS_W83781D_TEMP1_OVER, "temp1_over", SENSORS_W83781D_TEMP1, SENSORS_W83781D_TEMP1, RW, W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 }, @@ -826,7 +826,7 @@ static sensors_chip_feature w83781d_features[] = R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 }, { SENSORS_W83781D_TEMP2_HYST, "temp2_hyst", SENSORS_W83781D_TEMP2, SENSORS_W83781D_TEMP2, RW, - W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_min2", 2 }, + W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 }, { SENSORS_W83781D_TEMP2_OVER, "temp2_over", SENSORS_W83781D_TEMP2, SENSORS_W83781D_TEMP2, RW, W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 }, @@ -834,7 +834,7 @@ static sensors_chip_feature w83781d_features[] = R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 }, { SENSORS_W83781D_TEMP3_HYST, "temp3_hyst", SENSORS_W83781D_TEMP3, SENSORS_W83781D_TEMP3, RW, - W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_min3", 2 }, + W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_hyst3", 2 }, { SENSORS_W83781D_TEMP3_OVER, "temp3_over", SENSORS_W83781D_TEMP3, SENSORS_W83781D_TEMP3, RW, W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 }, @@ -959,7 +959,7 @@ static sensors_chip_feature as99127f_features[] = R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 }, { SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1, SENSORS_W83782D_TEMP1, RW, - W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_min1", 2 }, + W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 }, { SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1, SENSORS_W83782D_TEMP1, RW, W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 }, @@ -967,7 +967,7 @@ static sensors_chip_feature as99127f_features[] = R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 }, { SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2, SENSORS_W83782D_TEMP2, RW, - W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_min2", 2 }, + W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 }, { SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2, SENSORS_W83782D_TEMP2, RW, W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 }, @@ -975,7 +975,7 @@ static sensors_chip_feature as99127f_features[] = R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 }, { SENSORS_W83782D_TEMP3_HYST, "temp3_hyst", SENSORS_W83782D_TEMP3, SENSORS_W83782D_TEMP3, RW, - W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_min3", 2 }, + W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_hyst3", 2 }, { SENSORS_W83782D_TEMP3_OVER, "temp3_over", SENSORS_W83782D_TEMP3, SENSORS_W83782D_TEMP3, RW, W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 }, @@ -1168,7 +1168,7 @@ static sensors_chip_feature w83782d_features[] = R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 }, { SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1, SENSORS_W83782D_TEMP1, RW, - W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_min1", 2 }, + W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 }, { SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1, SENSORS_W83782D_TEMP1, RW, W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 }, @@ -1176,7 +1176,7 @@ static sensors_chip_feature w83782d_features[] = R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 }, { SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2, SENSORS_W83782D_TEMP2, RW, - W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_min2", 2 }, + W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 }, { SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2, SENSORS_W83782D_TEMP2, RW, W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 }, @@ -1184,10 +1184,10 @@ static sensors_chip_feature w83782d_features[] = R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 }, { SENSORS_W83782D_TEMP3_HYST, "temp3_hyst", SENSORS_W83782D_TEMP3, SENSORS_W83782D_TEMP3, RW, - W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_min3", 2 }, + W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_hyst3", 2 }, { SENSORS_W83782D_TEMP3_OVER, "temp3_over", SENSORS_W83782D_TEMP3, SENSORS_W83782D_TEMP3, RW, - W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_min3", 2 }, + W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 }, { SENSORS_W83782D_VID, "vid", NOMAP, NOMAP, R, W83781D_SYSCTL_VID, VALUE(1), 3 }, { SENSORS_W83782D_VRM, "vrm", NOMAP, NOMAP, @@ -1298,7 +1298,7 @@ static sensors_chip_feature w83783s_features[] = R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 }, { SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1, SENSORS_W83782D_TEMP1, RW, - W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_min1", 2 }, + W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 }, { SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1, SENSORS_W83782D_TEMP1, RW, W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 }, @@ -1306,7 +1306,7 @@ static sensors_chip_feature w83783s_features[] = R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 }, { SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2, SENSORS_W83782D_TEMP2, RW, - W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_min2", 2 }, + W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 }, { SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2, SENSORS_W83782D_TEMP2, RW, W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 }, diff --git a/lib/proc.c b/lib/proc.c index d73ea1cd..57b192ea 100644 --- a/lib/proc.c +++ b/lib/proc.c @@ -421,8 +421,8 @@ int sensors_write_proc(sensors_chip_name name, int feature, double value) in%d_max -> in_max%d in%d_min -> in_min%d in%d -> in_input%d - temp%d_over -> temp_max%d (to be changed after kernel patch) - temp%d_hyst -> temp_min%d ("") + temp%d_over -> temp_max%d + temp%d_hyst -> temp_hyst%d temp%d_max -> temp_max%d temp%d_high -> temp_max%d temp%d_min -> temp_min%d @@ -458,7 +458,7 @@ int getsysname(const sensors_chip_feature *feature, char *sysname, int *sysmag) { "remote_temp_low", "temp_min2", TEMPMAG }, { "remote_temp_over", "temp_max2", TEMPMAG }, { "temp", "temp_input1", TEMPMAG }, - { "temp_hyst", "temp_min1", TEMPMAG }, /* kernel patch pending for hyst */ + { "temp_hyst", "temp_hyst1", TEMPMAG }, { "temp_low", "temp_min1", TEMPMAG }, { "temp_over", "temp_max1", TEMPMAG }, { NULL, NULL } @@ -530,7 +530,7 @@ int getsysname(const sensors_chip_feature *feature, char *sysname, int *sysmag) } if(sscanf(name, "temp%d_hys%c%c", &num, &last, &check) == 2 && last == 't') { - sprintf(sysname, "temp_min%d", num); /* kernel patch pending for hyst */ + sprintf(sysname, "temp_hyst%d", num); *sysmag = TEMPMAG; return 0; }