GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-25 22:14:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #152 from luke-jr/specify_driver

Browse Source 
Allow specifying a specific driver for --scan-serial
This commit is contained in:
Con Kolivas 2012-03-28 04:21:41 -07:00
commit 36aadd6609
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitforce.c
View File

@ -203,13 +203,17 @@ static void bitforce_detect_auto()
static void bitforce_detect() static void bitforce_detect()
{ {
struct string_elist *iter, *tmp; struct string_elist *iter, *tmp;
const char*s;
bool found = false; bool found = false;
bool autoscan = false; bool autoscan = false;
list_for_each_entry_safe(iter, tmp, &scan_devices, list) { list_for_each_entry_safe(iter, tmp, &scan_devices, list) {
if (!strcmp(iter->string, "auto")) s = iter->string;
if (!strncmp("bitforce:", iter->string, 9))
s += 9;
if (!strcmp(s, "auto"))
autoscan = true; autoscan = true;
else if (bitforce_detect_one(iter->string)) { else if (bitforce_detect_one(s)) {
string_elist_del(iter); string_elist_del(iter);
found = true; found = true;
} }

6
icarus.c
View File

@ -205,9 +205,13 @@ static bool icarus_detect_one(const char *devpath)
static void icarus_detect() static void icarus_detect()
{ {
struct string_elist *iter, *tmp; struct string_elist *iter, *tmp;
const char*s;
list_for_each_entry_safe(iter, tmp, &scan_devices, list) { list_for_each_entry_safe(iter, tmp, &scan_devices, list) {
if (icarus_detect_one(iter->string)) s = iter->string;
if (!strncmp("icarus:", iter->string, 7))
s += 7;
if (icarus_detect_one(s))
string_elist_del(iter); string_elist_del(iter);
} }
} }