1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 14:58:01 +00:00
Commit Graph

304 Commits

Author SHA1 Message Date
Con Kolivas
669bcac36c Merge branch 'master' into hashfast 2013-10-23 12:06:20 +11:00
Con Kolivas
269a145a70 Add usb command name to critical libusb error reporting. 2013-10-23 10:45:22 +11:00
Con Kolivas
44cc52c3d0 Drop usb buffering message to debug logging level. 2013-10-21 12:19:11 +11:00
Con Kolivas
6493b976d3 Drop usb buffering message to debug logging level. 2013-10-21 12:18:42 +11:00
Con Kolivas
31e8ebaffa Merge branch 'master' into hashfast 2013-10-19 16:08:17 +11:00
Con Kolivas
eed0afcd04 Convert libusb transfer errors to regular libusb error messages to allow for accurate message reporting. 2013-10-19 13:29:59 +11:00
Con Kolivas
d77f367279 Fixing the memory leak for remaining semaphores means we can go back to using async transfers on other OSes with our own timeout management again. 2013-10-18 23:42:02 +11:00
Con Kolivas
8e9f32a81b Add a forcelog variant of applog which invalidates any console lock to force output. 2013-10-18 23:30:05 +11:00
Con Kolivas
f5baf9f57a Merge branch 'master' into hashfast
Conflicts:
	usbutils.h
2013-10-18 19:12:13 +11:00
Con Kolivas
789d448e84 Perform sync transfers on shutdown to allow final transfers to complete. 2013-10-18 07:05:35 +11:00
Con Kolivas
ad8d94979f Destroy cgsems used after transfers to not leave open files on osx. 2013-10-18 06:55:30 +11:00
Con Kolivas
103bc0bafe Revert to using timeouts on !linux since libusb leaks memory without them. 2013-10-17 18:52:07 +11:00
Con Kolivas
955e971d3d Prevent further USB transfers from occurring once the shutdown signal has been sent to prevent transfers getting stuck and libusb failing to shut down. 2013-10-17 08:29:02 +11:00
Con Kolivas
7c6bd4a8fb Emulate the libusb_control_transfer sync setup in our async variant. 2013-10-15 00:26:50 +11:00
Con Kolivas
e6280c85d2 Add the libusb control setup size offset for control writes. 2013-10-15 00:13:06 +11:00
Con Kolivas
91d1d104d1 Merge branch 'master' of github.com:ckolivas/cgminer 2013-10-15 00:00:00 +11:00
Con Kolivas
8fdaeb0ac9 Differentiate send from receive in control transfers! 2013-10-14 23:59:01 +11:00
kanoi
bae0815edf Merge pull request #505 from kanoi/master
usbutils - make all libusb_error_name messages the same
2013-10-14 03:45:44 -07:00
Kano
108e73763b usbutils - make all libusb_error_name messages the same 2013-10-14 21:44:10 +11:00
Con Kolivas
9e287f9598 Merge pull request #499 from someone42/master
changes to bitburner driver for bitburner fury boards
2013-10-14 03:27:57 -07:00
Con Kolivas
e06e495ab8 Merge branch 'master' into hashfast 2013-10-14 15:07:32 +11:00
Con Kolivas
02a4f8df9c Convert the usb callback function to using cgsem_t timed waits to avoid race conditions with conditionals/mutexes. 2013-10-14 11:44:37 +11:00
Con Kolivas
1d9f90b256 Revert "Convert the usb callback function to use a cgsem_t using the timedwait code to avoid races with mutexes/conditionals."
This reverts commit 433465bcfc.

Not ready yet.
2013-10-14 11:39:15 +11:00
Con Kolivas
433465bcfc Convert the usb callback function to use a cgsem_t using the timedwait code to avoid races with mutexes/conditionals. 2013-10-14 11:35:47 +11:00
Con Kolivas
634151ffa0 Merge branch 'master' into hashfast 2013-10-14 10:06:37 +11:00
Con Kolivas
9ca22ed493 Use the one LIBUSB_ERROR_TIMEOUT for cancelled transactions since this error is explicitly tested for in various drivers. 2013-10-14 10:05:49 +11:00
Con Kolivas
a7580f1ff2 Do not use locking on usb callback function pthread signalling to prevent deadlock with libusb's own event lock. 2013-10-14 09:41:18 +11:00
Con Kolivas
8d1604a2e3 Do not use locking on usb callback function pthread signalling to prevent deadlock with libusb's own event lock. 2013-10-14 09:40:23 +11:00
Con Kolivas
d2d7a7468e Merge branch 'master' into hashfast 2013-10-14 00:54:39 +11:00
Con Kolivas
280dc4bf01 Lock mutex before second pthread_cond_wait in usbutils to prevent a race. 2013-10-14 00:54:05 +11:00
Con Kolivas
176cae2700 Add basic definitions for hashfast device recognition. 2013-10-13 18:42:33 +11:00
Con Kolivas
9b5c534911 Merge branch 'master' into hashfast
Conflicts:
	api.c
	configure.ac
	miner.h
	usbutils.c
	usbutils.h
2013-10-13 16:41:53 +11:00
Con Kolivas
84de52c1c6 Use a write lock when performing any USB control transfers to prevent concurrent transfers. 2013-10-13 10:11:46 +11:00
Con Kolivas
c069028648 Free a libusb transfer after we have finished using it to avoid a dereference in usb_control_transfer 2013-10-12 17:44:28 +11:00
Con Kolivas
84f642f563 Although async transfers are meant to use heap memory, we never return before the transfer function has completed so stack memory will suffice for control transfers, fixing a memory leak in the process. 2013-10-12 15:06:48 +11:00
Con Kolivas
2ca8d85906 Convert all usb control transfers to asynchronous communication with our own timeout management as well. 2013-10-12 08:45:03 +11:00
Con Kolivas
b537976036 Make pthread conditional timeouts handle all bulk usb transfer timeouts performing libusb_cancel_transfer, disabling timeouts within libusb itself. 2013-10-11 23:06:40 +11:00
Chris Chua
b509e84376 using separate identifier for bitburner fury boards 2013-10-11 21:14:59 +11:00
Con Kolivas
03ad59f287 Add a small amount to the usb timeout before cancelling to allow for a regular usb polling interval to pass. 2013-10-11 15:37:55 +11:00
Con Kolivas
08d8612f68 Do not attempt to clear a usb halt before sending the cancel message since all transfers should normally be cancelled before attempting to clear a halt condition, and only change the return message to a timeout if it's consistent with a cancellation. 2013-10-11 14:47:01 +11:00
Con Kolivas
6d18ce4caa Retry up to USB_RETRY_MAX times to clear a halt condition before failing. 2013-10-11 14:37:40 +11:00
Con Kolivas
3a7a677f45 Show the error number as well as the description in erroring bulk transfers. 2013-10-11 13:43:16 +11:00
Con Kolivas
b5dfacef24 We are always dependent on libusb handling events so use the blocking libusb_handle_events in the polling thread and use a bool to know if we should continue polling. 2013-10-11 10:15:06 +11:00
Con Kolivas
853aa28ffc Merge branch 'master' into async
Conflicts:
	usbutils.c
2013-10-11 08:49:59 +11:00
Con Kolivas
32bc746178 Check for presence of driver name in DRIVER_COUNT_FOUND to prevent strcmp on a null pointer when a driver is not built in. 2013-10-09 22:17:56 +11:00
Con Kolivas
dc9c3783ec Display errors on failed usb read and write and consider sequential IO errors a permanent failure. 2013-10-08 22:05:01 +11:00
Con Kolivas
a22f5bfddd Use libusb's own error name function instead of hand coding the error names. 2013-10-08 21:40:04 +11:00
Con Kolivas
efd8c44182 Check for async transfer variants of error messages. 2013-10-08 21:01:04 +11:00
Con Kolivas
2806f49c01 Revert "Check for the async variants of the libusb errors and retry up to retry max when trying to clear a pipe error/stall."
This reverts commit c7d5256b36.
2013-10-08 21:00:51 +11:00
Con Kolivas
d34279b226 Remove unused variables. 2013-10-08 20:48:26 +11:00