Commit e7694887e5a908541ba8ba6fdf8400780c11d366
2014-07-28T12:57:47
Set avalon2 frequency and voltage to appropriate defaults if none are specified on the command line
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 49 50 51 52 53 54 55 56 57 58
diff --git a/driver-avalon2.c b/driver-avalon2.c
index a825c7f..ee9e0de 100644
--- a/driver-avalon2.c
+++ b/driver-avalon2.c
@@ -44,14 +44,14 @@ ASSERT1(sizeof(uint32_t) == 4);
#define get_fan_pwm(v) (AVA2_PWM_MAX - (v) * AVA2_PWM_MAX / 100)
-int opt_avalon2_freq_min = AVA2_DEFAULT_FREQUENCY;
-int opt_avalon2_freq_max = AVA2_DEFAULT_FREQUENCY_MAX;
+int opt_avalon2_freq_min;
+int opt_avalon2_freq_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;
+int opt_avalon2_voltage_min;
+int opt_avalon2_voltage_max;
int opt_avalon2_overheat = AVALON2_TEMP_OVERHEAT;
enum avalon2_fan_fixed opt_avalon2_fan_fixed = FAN_AUTO;
@@ -664,8 +664,6 @@ static bool avalon2_detect_one(const char *devpath)
info->fd = -1;
info->baud = AVA2_IO_SPEED;
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;
for (i = 0; i < AVA2_DEFAULT_MODULARS; i++) {
@@ -674,12 +672,23 @@ static bool avalon2_detect_one(const char *devpath)
info->enable[i] = modular[i];
info->dev_type[i] = AVA2_ID_AVAX;
- if (!strncmp((char *)&(info->mm_version[i]), AVA2_FW2_PREFIXSTR, 2))
+ if (!strncmp((char *)&(info->mm_version[i]), AVA2_FW2_PREFIXSTR, 2)) {
info->dev_type[i] = AVA2_ID_AVA2;
- if (!strncmp((char *)&(info->mm_version[i]), AVA2_FW3_PREFIXSTR, 2))
+ info->set_voltage = AVA2_DEFAULT_VOLTAGE_MIN;
+ info->set_frequency = AVA2_DEFAULT_FREQUENCY;
+ }
+ if (!strncmp((char *)&(info->mm_version[i]), AVA2_FW3_PREFIXSTR, 2)) {
info->dev_type[i] = AVA2_ID_AVA3;
+ info->set_voltage = AVA2_AVA3_VOLTAGE;
+ info->set_frequency = AVA2_AVA3_FREQUENCY;
+ }
}
+ if (!opt_avalon2_voltage_min)
+ opt_avalon2_voltage_min = opt_avalon2_voltage_max = info->set_voltage;
+ if (!opt_avalon2_freq_min)
+ opt_avalon2_freq_min = opt_avalon2_freq_max = info->set_frequency;
+
pool_stratum.swork.job_id = NULL;
pool_stratum.merkles = 0;
return true;