Commit 84ac4e737c4cf6217aa7687acc9eaf37a1d60cdf
2013-11-21T12:18:44
Use defines instead of 110 or 55
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 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
diff --git a/driver-avalon.c b/driver-avalon.c
index c72d5f5..5f7d666 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -110,7 +110,7 @@ static int avalon_init_task(struct avalon_task *at,
buf[10] = 0x00;
buf[11] = 0x00;
- if (asic == 110) {
+ if (asic == AVALON_A3256) {
lefreq16 = (uint16_t *)&buf[6];
*lefreq16 = htole16(frequency * 8);
} else {
@@ -307,7 +307,7 @@ static bool avalon_decode_nonce(struct thr_info *thr, struct cgpu_info *avalon,
info = avalon->device_data;
info->matching_work[work->subid]++;
nonce = htole32(ar->nonce);
- if (info->asic == 55)
+ if (info->asic == AVALON_A3255)
nonce -= 0xc0;
applog(LOG_DEBUG, "Avalon: nonce = %0x08x", nonce);
return submit_nonce(thr, work, nonce);
@@ -374,7 +374,7 @@ static int avalon_reset(struct cgpu_info *avalon, bool initial)
AVALON_DEFAULT_MINER_NUM,
0, 0,
AVALON_DEFAULT_FREQUENCY,
- 110);
+ AVALON_A3256);
wait_avalon_ready(avalon);
ret = avalon_send_task(&at, avalon);
@@ -563,7 +563,7 @@ static bool get_options(int this_option_offset, int *baud, int *miner_count,
*timeout = avalon_calc_timeout(*frequency);
if (colon5 && *colon5) {
tmp = atoi(colon5);
- if (tmp != 110 && tmp != 55)
+ if (tmp != AVALON_A3256 && tmp != AVALON_A3255)
quit(1, "Invalid avalon-options for asic, must be 110 or 55");
*asic = tmp;
}
@@ -821,6 +821,7 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
asic_count = AVALON_DEFAULT_ASIC_NUM;
timeout = AVALON_DEFAULT_TIMEOUT;
frequency = AVALON_DEFAULT_FREQUENCY;
+ asic = AVALON_A3256;
if (!usb_init(avalon, dev, found))
goto shin;
@@ -850,7 +851,7 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
info->timeout = timeout;
info->frequency = frequency;
} else {
- info->asic = 110;
+ info->asic = AVALON_A3256;
info->baud = AVALON_IO_SPEED;
info->asic_count = AVALON_DEFAULT_ASIC_NUM;
switch (usb_ident(avalon)) {
@@ -870,7 +871,7 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
info->temp_max = 0;
/* This is for check the temp/fan every 3~4s */
info->temp_history_count =
- (4 / (float)((float)info->timeout * (110 / info->asic) * ((float)1.67/0x32))) + 1;
+ (4 / (float)((float)info->timeout * (AVALON_A3256 / info->asic) * ((float)1.67/0x32))) + 1;
if (info->temp_history_count <= 0)
info->temp_history_count = 1;
diff --git a/driver-avalon.h b/driver-avalon.h
index 610a9d8..18870c9 100644
--- a/driver-avalon.h
+++ b/driver-avalon.h
@@ -22,6 +22,10 @@
#define AVALON_HASH_TIME_FACTOR ((float)1.67/0x32)
#define AVALON_RESET_PITCH (300*1000*1000)
+
+#define AVALON_A3256 110
+#define AVALON_A3255 55
+
#define AVALON_FAN_FACTOR 120
#define AVALON_PWM_MAX 0xA0
#define AVALON_DEFAULT_FAN_MIN 20
@@ -137,7 +141,7 @@ struct avalon_info {
int matching_work[AVALON_MAX_MINER_NUM];
int frequency;
- int asic;
+ uint32_t asic;
uint32_t ctlr_ver;
struct thr_info *thr;