Browse Source

Merge commit 'c9bd74c' into bfgminer

Conflicts:
	AUTHORS
Luke Dashjr 12 years ago
parent
commit
e608a00b6e
3 changed files with 3 additions and 2 deletions
  1. 1 0
      AUTHORS
  2. 1 1
      driver-cairnsmore.c
  3. 1 1
      icarus-common.h

+ 1 - 0
AUTHORS

@@ -43,6 +43,7 @@ pontus <liquidpontus@yahoo.se>
 Tydus <Tydus@Tydus.org>
 Raulo <p987341@gmail.com>
 Thorsten Gilling <tgilling@web.de>
+Isidoro Ghezzi <isidoro.ghezzi@icloud.com>
 capa66 <capa66@x204.com>
 Red_Wolf_2 <redwolf@wolfnexus.net>
 Mr O <notanatheist@gmail.com>

+ 1 - 1
driver-cairnsmore.c

@@ -45,7 +45,7 @@ static bool cairnsmore_detect_one(const char *devpath)
 	info->baud = CAIRNSMORE1_IO_SPEED;
 	info->work_division = 2;
 	info->fpga_count = 2;
-	info->quirk_reopen = false;
+	info->quirk_reopen = 0;
 	info->Hs = CAIRNSMORE1_HASH_TIME;
 	info->timing_mode = MODE_LONG;
 	info->do_icarus_timing = true;

+ 1 - 1
icarus-common.h

@@ -83,7 +83,7 @@ struct ICARUS_INFO {
 	int work_division;
 	int fpga_count;
 	uint32_t nonce_mask;
-	bool quirk_reopen;
+	int quirk_reopen;
 	uint8_t user_set;
 	bool continue_search;