GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

Do avalon driver detection last as it will try to claim any similar device and they are not reliably detected.

Browse Source
This commit is contained in:
Con Kolivas 2013-05-30 11:43:25 +10:00
parent 274bf69485
commit f4a9a8e60c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cgminer.c
View File

@ -7155,10 +7155,6 @@ static void *hotplug_thread(void __maybe_unused *userdata)
icarus_drv.drv_detect(); icarus_drv.drv_detect();
#endif #endif
#ifdef USE_AVALON
avalon_drv.drv_detect();
#endif
#ifdef USE_BFLSC #ifdef USE_BFLSC
bflsc_drv.drv_detect(); bflsc_drv.drv_detect();
#endif #endif
@ -7171,6 +7167,10 @@ static void *hotplug_thread(void __maybe_unused *userdata)
modminer_drv.drv_detect(); modminer_drv.drv_detect();
#endif #endif
#ifdef USE_AVALON
avalon_drv.drv_detect();
#endif
if (new_devices) if (new_devices)
hotplug_process(); hotplug_process();
@ -7384,11 +7384,6 @@ int main(int argc, char *argv[])
icarus_drv.drv_detect(); icarus_drv.drv_detect();
#endif #endif
#ifdef USE_AVALON
if (!opt_scrypt)
avalon_drv.drv_detect();
#endif
#ifdef USE_BFLSC #ifdef USE_BFLSC
if (!opt_scrypt) if (!opt_scrypt)
bflsc_drv.drv_detect(); bflsc_drv.drv_detect();
@ -7409,6 +7404,13 @@ int main(int argc, char *argv[])
ztex_drv.drv_detect(); ztex_drv.drv_detect();
#endif #endif
/* Detect avalon last since it will try to claim the device regardless
* as detection is unreliable. */
#ifdef USE_AVALON
if (!opt_scrypt)
avalon_drv.drv_detect();
#endif
if (devices_enabled == -1) { if (devices_enabled == -1) {
applog(LOG_ERR, "Devices detected:"); applog(LOG_ERR, "Devices detected:");
for (i = 0; i < total_devices; ++i) { for (i = 0; i < total_devices; ++i) {