Commit 2cc3a386e7ddd615faa10136dee0f7f5cb038cce
2014-07-28T12:26:48
Fix broken fan logic for ava2
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/driver-avalon2.c b/driver-avalon2.c
index d2724a8..e6400ec 100644
--- a/driver-avalon2.c
+++ b/driver-avalon2.c
@@ -47,8 +47,8 @@ ASSERT1(sizeof(uint32_t) == 4);
int opt_avalon2_freq_min = AVA2_DEFAULT_FREQUENCY;
int opt_avalon2_freq_max = AVA2_DEFAULT_FREQUENCY_MAX;
-int opt_avalon2_fan_min = AVA2_DEFAULT_FAN_PWM;
-int opt_avalon2_fan_max = AVA2_DEFAULT_FAN_MAX;
+int opt_avalon2_fan_min = get_fan_pwm(AVA2_DEFAULT_FAN_MIN);
+int opt_avalon2_fan_max = get_fan_pwm(AVA2_DEFAULT_FAN_MAX);
int opt_avalon2_voltage_min = AVA2_DEFAULT_VOLTAGE;
int opt_avalon2_voltage_max = AVA2_DEFAULT_VOLTAGE_MAX;
@@ -216,7 +216,7 @@ static void adjust_fan(struct avalon2_info *info)
int t;
if (unlikely(info->first < 2) || opt_avalon2_fan_fixed == FAN_FIXED) {
- info->fan_pwm = opt_avalon2_fan_min;
+ info->fan_pwm = get_fan_pwm(AVA2_DEFAULT_FAN_PWM);
return;
}
@@ -663,7 +663,7 @@ static bool avalon2_detect_one(const char *devpath)
info->fd = -1;
info->baud = AVA2_IO_SPEED;
- info->fan_pwm = AVA2_DEFAULT_FAN_PWM;
+ info->fan_pwm = get_fan_pwm(AVA2_DEFAULT_FAN_PWM);
info->set_voltage = AVA2_DEFAULT_VOLTAGE_MIN;
info->set_frequency = AVA2_DEFAULT_FREQUENCY;
info->temp_max = 0;
diff --git a/driver-avalon2.h b/driver-avalon2.h
index bd6340d..541e789 100644
--- a/driver-avalon2.h
+++ b/driver-avalon2.h
@@ -24,8 +24,8 @@
#define AVA2_DEFAULT_MODULARS 4
#define AVA2_PWM_MAX 0x3FF
-#define AVA2_DEFAULT_FAN_PWM 80 /* % */
-#define AVA2_DEFAULT_FAN_MIN 0
+#define AVA2_DEFAULT_FAN_PWM 50 /* % */
+#define AVA2_DEFAULT_FAN_MIN 20
#define AVA2_DEFAULT_FAN_MAX 100
#define AVALON2_TEMP_OVERHEAT 88