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

Implement and use usb_cleanup() on shutdown or restart

Browse Source
This commit is contained in:
Kano 2013-03-04 09:45:07 +11:00
parent 5d3faba603
commit e35e8ae135
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cgminer.c
View File

@ -2842,6 +2842,16 @@ static void __kill_work(void)
applog(LOG_DEBUG, "Killing off API thread"); applog(LOG_DEBUG, "Killing off API thread");
thr = &control_thr[api_thr_id]; thr = &control_thr[api_thr_id];
thr_info_cancel(thr); thr_info_cancel(thr);
#if defined(USE_MODMINER) || defined(USE_BITFORCE)
/* Release USB resources in case it's a restart
* and not a QUIT */
if (!opt_scrypt) {
applog(LOG_DEBUG, "Releasing all USB devices");
usb_cleanup();
}
#endif
} }
/* This should be the common exit path */ /* This should be the common exit path */

16
usbutils.c
View File

@ -184,6 +184,7 @@ static const char *C_SETFLOW_S = "SetFlowCtrl";
static const char *C_SETMODEM_S = "SetModemCtrl"; static const char *C_SETMODEM_S = "SetModemCtrl";
static const char *C_PURGERX_S = "PurgeRx"; static const char *C_PURGERX_S = "PurgeRx";
static const char *C_PURGETX_S = "PurgeTx"; static const char *C_PURGETX_S = "PurgeTx";
static const char *C_FLASHREPLY_S = "FlashReply";
#ifdef EOL #ifdef EOL
#undef EOL #undef EOL
@ -572,6 +573,7 @@ static void cgusb_check_init()
usb_commands[C_SETMODEM] = C_SETMODEM_S; usb_commands[C_SETMODEM] = C_SETMODEM_S;
usb_commands[C_PURGERX] = C_PURGERX_S; usb_commands[C_PURGERX] = C_PURGERX_S;
usb_commands[C_PURGETX] = C_PURGETX_S; usb_commands[C_PURGETX] = C_PURGETX_S;
usb_commands[C_FLASHREPLY] = C_FLASHREPLY_S;
stats_initialised = true; stats_initialised = true;
} }
@ -1522,5 +1524,17 @@ int _usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest
void usb_cleanup() void usb_cleanup()
{ {
// TODO: int i;
mutex_lock(&devices_lock);
for (i = 0; i < total_devices; i++) {
switch (devices[i]->drv->drv_id) {
case DRIVER_BITFORCE:
case DRIVER_MODMINER:
release_cgpu(devices[i]);
default:
break;
}
}
mutex_unlock(&devices_lock);
} }

1
usbutils.h
View File

@ -122,6 +122,7 @@ enum usb_cmds {
C_SETMODEM, C_SETMODEM,
C_PURGERX, C_PURGERX,
C_PURGETX, C_PURGETX,
C_FLASHREPLY,
C_MAX C_MAX
}; };