Merge branch 'master' into redfury
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789
diff --git a/driver-avalon.c b/driver-avalon.c
index 824005e..2873bbc 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -1531,7 +1531,7 @@ static struct api_data *avalon_api_stats(struct cgpu_info *cgpu)
info->version1, info->version2, info->version3);
root = api_add_string(root, "version", buf, true);
}
- root = api_add_int(root, "Controller Version", &(info->ctlr_ver), false);
+ root = api_add_uint32(root, "Controller Version", &(info->ctlr_ver), false);
return root;
}
diff --git a/driver-icarus.c b/driver-icarus.c
index 42814a1..8ffe390 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -177,6 +177,8 @@ static const char *MODE_VALUE_STR = "value";
static const char *MODE_UNKNOWN_STR = "unknown";
struct ICARUS_INFO {
+ int intinfo;
+
// time to calculate the golden_ob
uint64_t golden_hashes;
struct timeval golden_tv;
@@ -277,7 +279,7 @@ static void icarus_initialise(struct cgpu_info *icarus, int baud)
usb_set_cps(icarus, baud / 10);
usb_enable_cps(icarus);
- interface = usb_interface(icarus);
+ interface = _usb_interface(icarus, info->intinfo);
ident = usb_ident(icarus);
switch (ident) {
@@ -287,9 +289,6 @@ static void icarus_initialise(struct cgpu_info *icarus, int baud)
case IDENT_CMR2:
usb_set_pps(icarus, BLT_PREF_PACKET);
- if (ident == IDENT_CMR2) // Chip hack
- interface++;
-
// Reset
transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_RESET, FTDI_VALUE_RESET,
interface, C_RESET);
@@ -434,6 +433,7 @@ static void rev(unsigned char *s, size_t l)
static int icarus_get_nonce(struct cgpu_info *icarus, unsigned char *buf, struct timeval *tv_start, struct timeval *tv_finish, struct thr_info *thr, int read_time)
{
+ struct ICARUS_INFO *info = (struct ICARUS_INFO *)(icarus->device_data);
struct timeval read_start, read_finish;
int err, amt;
int rc = 0;
@@ -446,7 +446,9 @@ static int icarus_get_nonce(struct cgpu_info *icarus, unsigned char *buf, struct
return ICA_NONCE_ERROR;
cgtime(&read_start);
- err = usb_read_timeout(icarus, (char *)buf, read_amount, &amt, ICARUS_WAIT_TIMEOUT, C_GETRESULTS);
+ err = usb_read_ii_timeout(icarus, info->intinfo,
+ (char *)buf, read_amount, &amt,
+ ICARUS_WAIT_TIMEOUT, C_GETRESULTS);
cgtime(&read_finish);
if (err < 0 && err != LIBUSB_ERROR_TIMEOUT) {
applog(LOG_ERR, "%s%i: Comms error (rerr=%d amt=%d)",
@@ -879,7 +881,7 @@ static bool icarus_detect_one(struct libusb_device *dev, struct usb_find_devices
struct cgpu_info *cgtmp;
struct ICARUS_INFO *intmp;
- cgtmp = usb_init_intinfo(icarus, i);
+ cgtmp = usb_copy_cgpu(icarus);
if (!cgtmp) {
applog(LOG_ERR, "%s%d: Init failed initinfo %d",
icarus->drv->name, icarus->device_id, i);
@@ -903,6 +905,8 @@ static bool icarus_detect_one(struct libusb_device *dev, struct usb_find_devices
// Initialise everything to match
memcpy(intmp, info, sizeof(struct ICARUS_INFO));
+
+ intmp->intinfo = i;
}
}
@@ -976,7 +980,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
// We only want results for the work we are about to send
usb_buffer_clear(icarus);
- err = usb_write(icarus, (char *)ob_bin, sizeof(ob_bin), &amount, C_SENDWORK);
+ err = usb_write_ii(icarus, info->intinfo, (char *)ob_bin, sizeof(ob_bin), &amount, C_SENDWORK);
if (err < 0 || amount != sizeof(ob_bin)) {
applog(LOG_ERR, "%s%i: Comms error (werr=%d amt=%d)",
icarus->drv->name, icarus->device_id, err, amount);
diff --git a/usbutils.c b/usbutils.c
index fe3b9cf..8dd23e2 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -94,10 +94,18 @@
#define USB_EPS(_intx, _epinfosx) { \
.interface = _intx, \
+ .ctrl_transfer = _intx, \
.epinfo_count = ARRAY_SIZE(_epinfosx), \
.epinfos = _epinfosx \
}
+#define USB_EPS_CTRL(_inty, _ctrlinty, _epinfosy) { \
+ .interface = _inty, \
+ .ctrl_transfer = _ctrlinty, \
+ .epinfo_count = ARRAY_SIZE(_epinfosy), \
+ .epinfos = _epinfosy \
+ }
+
#ifdef USE_BFLSC
// N.B. transfer size is 512 with USB2.0, but only 64 with USB1.1
static struct usb_epinfo bas_epinfos[] = {
@@ -196,7 +204,6 @@ static struct usb_epinfo cmr2_epinfos0[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(1), 0 },
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(2), 0 }
};
-#ifndef WIN32
static struct usb_epinfo cmr2_epinfos1[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(3), 0 },
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(4), 0 },
@@ -209,29 +216,24 @@ static struct usb_epinfo cmr2_epinfos3[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(7), 0 },
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(8), 0 }
};
-#endif
static struct usb_intinfo cmr2_ints[] = {
- USB_EPS(0, cmr2_epinfos0)
-#ifndef WIN32
- ,
- USB_EPS(1, cmr2_epinfos1),
- USB_EPS(2, cmr2_epinfos2),
- USB_EPS(3, cmr2_epinfos3)
-#endif
+ USB_EPS_CTRL(0, 1, cmr2_epinfos0),
+ USB_EPS_CTRL(1, 2, cmr2_epinfos1),
+ USB_EPS_CTRL(2, 3, cmr2_epinfos2),
+ USB_EPS_CTRL(3, 4, cmr2_epinfos3)
};
#endif
#define IDVENDOR_FTDI 0x0403
#define INTINFO(_ints) \
- .which_intinfo = 0, \
.intinfo_count = ARRAY_SIZE(_ints), \
.intinfos = _ints
-#define USBEP(_usbdev, _epinfo) (_usbdev->found->intinfos[_usbdev->found->which_intinfo].epinfos[_epinfo].ep)
-#define FOUNDIF(_found) (_found->intinfos[_found->which_intinfo].interface)
-#define USBIF(_usbdev) FOUNDIF(_usbdev->found)
+#define USBEP(_usbdev, _intinfo, _epinfo) (_usbdev->found->intinfos[_intinfo].epinfos[_epinfo].ep)
+#define THISIF(_found, _this) (_found->intinfos[_this].interface)
+#define USBIF(_usbdev, _this) THISIF(_usbdev->found, _this)
// TODO: Add support for (at least) Isochronous endpoints
static struct usb_find_devices find_dev[] = {
@@ -392,11 +394,10 @@ static struct usb_find_devices find_dev[] = {
.config = 1,
.timeout = 100,
.latency = LATENCY_UNUSED,
- .which_intinfo = 0,
.intinfo_count = 0,
.intinfos = NULL },
#endif
- { DRV_LAST, NULL, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
+ { DRV_LAST, NULL, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, NULL }
};
#ifdef USE_BFLSC
@@ -1305,6 +1306,8 @@ static struct cg_usb_device *free_cgusb(struct cg_usb_device *cgusb)
static void _usb_uninit(struct cgpu_info *cgpu)
{
+ int ifinfo;
+
applog(LOG_DEBUG, "USB uninit %s%i",
cgpu->drv->name, cgpu->device_id);
@@ -1314,7 +1317,10 @@ static void _usb_uninit(struct cgpu_info *cgpu)
return;
if (cgpu->usbdev->handle) {
- libusb_release_interface(cgpu->usbdev->handle, USBIF(cgpu->usbdev));
+ for (ifinfo = cgpu->usbdev->found->intinfo_count - 1; ifinfo >= 0; ifinfo--) {
+ libusb_release_interface(cgpu->usbdev->handle,
+ THISIF(cgpu->usbdev->found, ifinfo));
+ }
cg_wlock(&cgusb_fd_lock);
libusb_close(cgpu->usbdev->handle);
cgpu->usbdev->handle = NULL;
@@ -1342,7 +1348,7 @@ static void release_cgpu(struct cgpu_info *cgpu)
{
struct cg_usb_device *cgusb = cgpu->usbdev;
struct cgpu_info *lookcgpu;
- int which_intinfo, i;
+ int i;
applog(LOG_DEBUG, "USB release %s%i",
cgpu->drv->name, cgpu->device_id);
@@ -1360,7 +1366,6 @@ static void release_cgpu(struct cgpu_info *cgpu)
cgtime(&cgpu->usbinfo.last_nodev);
// Any devices sharing the same USB device should be marked also
- // Currently only MMQ shares a USB device
for (i = 0; i < total_devices; i++) {
lookcgpu = get_devices(i);
if (lookcgpu != cgpu && lookcgpu->usbdev == cgusb) {
@@ -1375,15 +1380,12 @@ static void release_cgpu(struct cgpu_info *cgpu)
}
}
- which_intinfo = cgpu->usbdev->found->which_intinfo;
_usb_uninit(cgpu);
- if (which_intinfo == 0)
- cgminer_usb_unlock_bd(cgpu->drv, cgpu->usbinfo.bus_number, cgpu->usbinfo.device_address);
+ cgminer_usb_unlock_bd(cgpu->drv, cgpu->usbinfo.bus_number, cgpu->usbinfo.device_address);
}
/*
- * Used by MMQ - use the same usbdev thus locking is across all 4 related devices
- * since they must use the same USB handle since they use the same interface
+ * Use the same usbdev thus locking is across all related devices
*/
struct cgpu_info *usb_copy_cgpu(struct cgpu_info *orig)
{
@@ -1407,80 +1409,11 @@ struct cgpu_info *usb_copy_cgpu(struct cgpu_info *orig)
copy->usbinfo.nodev = (copy->usbdev == NULL);
- copy->usbinfo.devlock = orig->usbinfo.devlock;
-
DEVUNLOCK(orig, pstate);
return copy;
}
-/*
- * Used by CMR - use a different usbdev - since they must use a different
- * USB handle due to using different interfaces (libusb requirement)
- * N.B. multiple interfaces don't as yet work in windows libusb
- * so the CMR defines above that use them are defined out in windows
- * Nothing else uses multiple interfaces as at 20130922
- */
-static struct cgpu_info *usb_dup_cgpu(struct cgpu_info *orig, int intinfo)
-{
- struct cgpu_info *copy;
-
- copy = calloc(1, sizeof(*copy));
- if (unlikely(!copy))
- quit(1, "Failed to calloc cgpu for %s in usb_dup_cgpu", orig->drv->dname);
-
- copy->name = orig->name;
- copy->drv = copy_drv(orig->drv);
- copy->deven = orig->deven;
- copy->threads = orig->threads;
-
- if (orig->usbdev) {
- copy->usbdev = calloc(1, sizeof(*(copy->usbdev)));
- if (unlikely(!copy->usbdev))
- quit(1, "Failed to calloc usbdev for %s in usb_dup_cgpu", orig->drv->dname);
-
- copy->usbdev->found = malloc(sizeof(*(copy->usbdev->found)));
- if (unlikely(!copy->usbdev->found))
- quit(1, "Failed to malloc found for %s in usb_dup_cgpu", orig->drv->dname);
- memcpy(copy->usbdev->found, orig->usbdev->found, sizeof(*(copy->usbdev->found)));
-
- copy->usbdev->found->which_intinfo = intinfo;
-
- copy->usbdev->descriptor = NULL; // don't need it
- copy->usbdev->usb_type = orig->usbdev->usb_type;
- copy->usbdev->ident = orig->usbdev->ident;
- copy->usbdev->usbver = orig->usbdev->usbver;
- copy->usbdev->cps = orig->usbdev->cps;
- copy->usbdev->usecps = orig->usbdev->usecps;
- if (orig->usbdev->prod_string == BLANK)
- copy->usbdev->prod_string = (char *)BLANK;
- else
- copy->usbdev->prod_string = strdup(orig->usbdev->prod_string);
- if (orig->usbdev->manuf_string == BLANK)
- copy->usbdev->manuf_string = (char *)BLANK;
- else
- copy->usbdev->manuf_string = strdup(orig->usbdev->manuf_string);
- if (orig->usbdev->serial_string == BLANK)
- copy->usbdev->serial_string = (char *)BLANK;
- else
- copy->usbdev->serial_string = strdup(orig->usbdev->serial_string);
- copy->usbdev->fwVersion = orig->usbdev->fwVersion;
- copy->usbdev->interfaceVersion = orig->usbdev->interfaceVersion;
- }
-
- memcpy(&(copy->usbinfo), &(orig->usbinfo), sizeof(copy->usbinfo));
-
- copy->usbinfo.nodev = (copy->usbdev == NULL);
-
- copy->usbinfo.devlock = calloc(1, sizeof(*(copy->usbinfo.devlock)));
- if (unlikely(!copy->usbinfo.devlock))
- quit(1, "Failed to calloc devlock for %s in usb_dup_cgpu", orig->drv->dname);
-
- rwlock_init(copy->usbinfo.devlock);
-
- return copy;
-}
-
struct cgpu_info *usb_alloc_cgpu(struct device_drv *drv, int threads)
{
struct cgpu_info *cgpu = calloc(1, sizeof(*cgpu));
@@ -1533,7 +1466,7 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
char devstr[STRBUFLEN+1];
int err, ifinfo, epinfo, alt, epnum, pstate;
int bad = USB_INIT_FAIL;
- int cfg;
+ int cfg, claimed = 0;
DEVLOCK(cgpu, pstate);
@@ -1544,7 +1477,7 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
snprintf(devpath, sizeof(devpath), "%d:%d-i%d",
(int)(cgpu->usbinfo.bus_number),
(int)(cgpu->usbinfo.device_address),
- FOUNDIF(found));
+ THISIF(found, 0));
} else {
snprintf(devpath, sizeof(devpath), "%d:%d",
(int)(cgpu->usbinfo.bus_number),
@@ -1606,18 +1539,22 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
}
#ifndef WIN32
- if (libusb_kernel_driver_active(cgusb->handle, FOUNDIF(found)) == 1) {
- applog(LOG_DEBUG, "USB init, kernel attached ... %s", devstr);
- err = libusb_detach_kernel_driver(cgusb->handle, FOUNDIF(found));
- if (err == 0) {
- applog(LOG_DEBUG,
- "USB init, kernel detached interface %d successfully %s",
- FOUNDIF(found), devstr);
- } else {
- applog(LOG_WARNING,
- "USB init, kernel detach interface %d failed, err %d in use? %s",
- FOUNDIF(found), err, devstr);
- goto cldame;
+ for (ifinfo = 0; ifinfo < found->intinfo_count; ifinfo++) {
+ if (libusb_kernel_driver_active(cgusb->handle, THISIF(found, ifinfo)) == 1) {
+ applog(LOG_DEBUG, "USB init, kernel attached ... %s", devstr);
+ err = libusb_detach_kernel_driver(cgusb->handle, THISIF(found, ifinfo));
+ if (err == 0) {
+ applog(LOG_DEBUG,
+ "USB init, kernel detached ifinfo %d interface %d"
+ " successfully %s",
+ ifinfo, THISIF(found, ifinfo), devstr);
+ } else {
+ applog(LOG_WARNING,
+ "USB init, kernel detach ifinfo %d interface %d failed,"
+ " err %d in use? %s",
+ ifinfo, THISIF(found, ifinfo), err, devstr);
+ goto cldame;
+ }
}
}
#endif
@@ -1740,20 +1677,26 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
goto cldame;
}
- err = libusb_claim_interface(cgusb->handle, FOUNDIF(found));
- if (err) {
- switch(err) {
- case LIBUSB_ERROR_BUSY:
- applog(LOG_WARNING,
- "USB init, claim interface %d in use %s",
- FOUNDIF(found), devstr);
- break;
- default:
- applog(LOG_DEBUG,
- "USB init, claim interface %d failed, err %d %s",
- FOUNDIF(found), err, devstr);
+ claimed = 0;
+ for (ifinfo = 0; ifinfo < found->intinfo_count; ifinfo++) {
+ err = libusb_claim_interface(cgusb->handle, THISIF(found, ifinfo));
+ if (err == 0)
+ claimed++;
+ else {
+ switch(err) {
+ case LIBUSB_ERROR_BUSY:
+ applog(LOG_WARNING,
+ "USB init, claim ifinfo %d interface %d in use %s",
+ ifinfo, THISIF(found, ifinfo), devstr);
+ break;
+ default:
+ applog(LOG_DEBUG,
+ "USB init, claim ifinfo %d interface %d failed,"
+ " err %d %s",
+ ifinfo, THISIF(found, ifinfo), err, devstr);
+ }
+ goto reldame;
}
- goto reldame;
}
cfg = -1;
@@ -1820,7 +1763,9 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
reldame:
- libusb_release_interface(cgusb->handle, FOUNDIF(found));
+ ifinfo = claimed;
+ while (ifinfo-- > 0)
+ libusb_release_interface(cgusb->handle, THISIF(found, ifinfo));
cldame:
@@ -1842,144 +1787,6 @@ out_unlock:
return bad;
}
-// To get the extra interfaces on a multi interface device
-struct cgpu_info *usb_init_intinfo(struct cgpu_info *orig, int intinfo)
-{
- struct usb_find_devices *found;
- struct libusb_device *dev;
- struct cgpu_info *copy = NULL;
- char msgstr[STRBUFLEN+1];
- char devstr[STRBUFLEN+1];
- char devpath[32];
- int err, pstate;
-
- DEVLOCK(orig, pstate);
-
- snprintf(msgstr, sizeof(msgstr), "USB %s init_intinfo (%d:%d-i%d)",
- orig->drv->dname,
- (int)(orig->usbinfo.bus_number),
- (int)(orig->usbinfo.device_address),
- orig->usbdev->found->which_intinfo);
-
- if (orig->usbinfo.nodev) {
- applog(LOG_ERR, "%s cgpu has nodev", msgstr);
- goto Hitagi;
- }
-
- if (orig->usbdev->found->which_intinfo != 0) {
- applog(LOG_ERR, "%s incorrect cgpu (must be i0)", msgstr);
- goto Hitagi;
- }
-
- if (orig->usbdev->found->intinfo_count < 2) {
- applog(LOG_ERR, "%s cgpu only has 1 interface", msgstr);
- goto Hitagi;
- }
-
- if (intinfo < 1 || intinfo >= orig->usbdev->found->intinfo_count) {
- applog(LOG_ERR, "%s invalid intinfo (%d) must be > 0 && < %d",
- msgstr, intinfo, orig->usbdev->found->intinfo_count);
- goto Hitagi;
- }
-
- dev = libusb_get_device(orig->usbdev->handle);
-
- copy = usb_dup_cgpu(orig, intinfo);
- if (!copy)
- goto Hitagi;
-
- found = copy->usbdev->found;
-
- snprintf(devpath, sizeof(devpath), "%d:%d-i%d",
- (int)(copy->usbinfo.bus_number),
- (int)(copy->usbinfo.device_address),
- FOUNDIF(found));
-
- copy->device_path = strdup(devpath);
-
- snprintf(devstr, sizeof(devstr), "- %s device %s", found->name, devpath);
-
- cg_wlock(&cgusb_fd_lock);
- err = libusb_open(dev, &(copy->usbdev->handle));
- cg_wunlock(&cgusb_fd_lock);
- if (err) {
- switch (err) {
- case LIBUSB_ERROR_ACCESS:
- applog(LOG_ERR,
- "USB init_intinfo, open device failed, err %d, "
- "you don't have privilege to access %s",
- err, devstr);
- break;
-#ifdef WIN32
- // Windows specific message
- case LIBUSB_ERROR_NOT_SUPPORTED:
- applog(LOG_ERR,
- "USB init_intinfo, open device failed, err %d, "
- "you need to install a WinUSB driver for %s",
- err, devstr);
- break;
-#endif
- default:
- applog(LOG_DEBUG,
- "USB init_intinfo, open failed, err %d %s",
- err, devstr);
- }
- goto Hitagi;
- }
-
-#ifndef WIN32
- if (libusb_kernel_driver_active(copy->usbdev->handle, FOUNDIF(found)) == 1) {
- applog(LOG_DEBUG, "USB init_intinfo, kernel attached ... %s", devstr);
- err = libusb_detach_kernel_driver(copy->usbdev->handle, FOUNDIF(found));
- if (err == 0) {
- applog(LOG_DEBUG,
- "USB init_intinfo, kernel detached interface %d successfully %s",
- FOUNDIF(found), devstr);
- } else {
- applog(LOG_WARNING,
- "USB init_intinfo, kernel detach interface %d failed, err %d in use? %s",
- FOUNDIF(found), err, devstr);
- goto HitagiClose;
- }
- }
-#endif
-
- err = libusb_claim_interface(copy->usbdev->handle, FOUNDIF(found));
- if (err) {
- switch(err) {
- case LIBUSB_ERROR_BUSY:
- applog(LOG_WARNING,
- "USB init_intinfo, claim interface %d in use %s",
- FOUNDIF(found), devstr);
- break;
- default:
- applog(LOG_DEBUG,
- "USB init_intinfo, claim interface %d failed, err %d %s",
- FOUNDIF(found), err, devstr);
- }
- goto HitagiClose;
- }
-
- goto Hitagi;
-
-HitagiClose:
-
- cg_wlock(&cgusb_fd_lock);
- libusb_close(copy->usbdev->handle);
- copy->usbdev->handle = NULL;
- cg_wunlock(&cgusb_fd_lock);
-
- copy->usbdev = free_cgusb(copy->usbdev);
-
- copy = usb_free_cgpu(copy);
-
-Hitagi:
-
- DEVUNLOCK(orig, pstate);
-
- return copy;
-}
-
bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found_match)
{
struct usb_find_devices *found_use = NULL;
@@ -2543,7 +2350,7 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle,
return err;
}
-int _usb_read(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int *processed, unsigned int timeout, const char *end, enum usb_cmds cmd, bool readonce)
+int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t bufsiz, int *processed, unsigned int timeout, const char *end, enum usb_cmds cmd, bool readonce)
{
struct cg_usb_device *usbdev;
bool ftdi;
@@ -2571,7 +2378,7 @@ int _usb_read(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int
usbdev = cgpu->usbdev;
ftdi = (usbdev->usb_type == USB_TYPE_FTDI);
- USBDEBUG("USB debug: _usb_read(%s (nodev=%s),epinfo=%d,buf=%p,bufsiz=%zu,proc=%p,timeout=%u,end=%s,cmd=%s,ftdi=%s,readonce=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), epinfo, buf, bufsiz, processed, timeout, end ? (char *)str_text((char *)end) : "NULL", usb_cmdname(cmd), bool_str(ftdi), bool_str(readonce));
+ USBDEBUG("USB debug: _usb_read(%s (nodev=%s),intinfo=%d,epinfo=%d,buf=%p,bufsiz=%zu,proc=%p,timeout=%u,end=%s,cmd=%s,ftdi=%s,readonce=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), intinfo, epinfo, buf, bufsiz, processed, timeout, end ? (char *)str_text((char *)end) : "NULL", usb_cmdname(cmd), bool_str(ftdi), bool_str(readonce));
if (bufsiz > USB_MAX_READ)
quit(1, "%s USB read request %d too large (max=%d)", cgpu->drv->name, (int)bufsiz, USB_MAX_READ);
@@ -2625,7 +2432,7 @@ int _usb_read(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int
}
}
err = usb_bulk_transfer(usbdev->handle,
- USBEP(usbdev, epinfo),
+ USBEP(usbdev, intinfo, epinfo),
ptr, usbbufread, &got, timeout,
cgpu, MODE_BULK_READ, cmd, first ? SEQ0 : SEQ1);
cgtime(&tv_finish);
@@ -2729,7 +2536,7 @@ int _usb_read(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int
}
}
err = usb_bulk_transfer(usbdev->handle,
- USBEP(usbdev, epinfo), ptr,
+ USBEP(usbdev, intinfo, epinfo), ptr,
usbbufread, &got, timeout,
cgpu, MODE_BULK_READ, cmd, first ? SEQ0 : SEQ1);
cgtime(&tv_finish);
@@ -2816,7 +2623,7 @@ out_unlock:
return err;
}
-int _usb_write(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int *processed, unsigned int timeout, enum usb_cmds cmd)
+int _usb_write(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t bufsiz, int *processed, unsigned int timeout, enum usb_cmds cmd)
{
struct cg_usb_device *usbdev;
struct timeval read_start, tv_finish;
@@ -2827,7 +2634,7 @@ int _usb_write(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int
DEVLOCK(cgpu, pstate);
- USBDEBUG("USB debug: _usb_write(%s (nodev=%s),epinfo=%d,buf='%s',bufsiz=%zu,proc=%p,timeout=%u,cmd=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), epinfo, (char *)str_text(buf), bufsiz, processed, timeout, usb_cmdname(cmd));
+ USBDEBUG("USB debug: _usb_write(%s (nodev=%s),intinfo=%d,epinfo=%d,buf='%s',bufsiz=%zu,proc=%p,timeout=%u,cmd=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), intinfo, epinfo, (char *)str_text(buf), bufsiz, processed, timeout, usb_cmdname(cmd));
*processed = 0;
@@ -2870,7 +2677,7 @@ int _usb_write(struct cgpu_info *cgpu, int epinfo, char *buf, size_t bufsiz, int
usbdev->last_write_siz = bufsiz;
}
err = usb_bulk_transfer(usbdev->handle,
- USBEP(usbdev, epinfo),
+ USBEP(usbdev, intinfo, epinfo),
(unsigned char *)buf, bufsiz, &sent,
timeout, cgpu, MODE_BULK_WRITE, cmd, first ? SEQ0 : SEQ1);
cgtime(&tv_finish);
@@ -3087,7 +2894,7 @@ int usb_ftdi_cts(struct cgpu_info *cgpu)
return (ret & FTDI_RS0_CTS);
}
-int usb_ftdi_set_latency(struct cgpu_info *cgpu)
+int _usb_ftdi_set_latency(struct cgpu_info *cgpu, int intinfo)
{
int err = 0;
int pstate;
@@ -3108,7 +2915,7 @@ int usb_ftdi_set_latency(struct cgpu_info *cgpu)
if (!err)
err = __usb_transfer(cgpu, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY,
cgpu->usbdev->found->latency,
- USBIF(cgpu->usbdev),
+ USBIF(cgpu->usbdev, intinfo),
NULL, 0, DEVTIMEOUT, C_LATENCY);
}
@@ -3226,8 +3033,10 @@ void usb_disable_cps(struct cgpu_info *cgpu)
* The value returned (0) when usbdev is NULL
* doesn't matter since it also means the next call to
* any usbutils function will fail with a nodev
+ * N.B. this is to get the interface number to use in a control_transfer
+ * which for some devices isn't actually the interface number
*/
-int usb_interface(struct cgpu_info *cgpu)
+int _usb_interface(struct cgpu_info *cgpu, int intinfo)
{
int interface = 0;
int pstate;
@@ -3235,7 +3044,7 @@ int usb_interface(struct cgpu_info *cgpu)
DEVLOCK(cgpu, pstate);
if (cgpu->usbdev)
- interface = USBIF(cgpu->usbdev);
+ interface = cgpu->usbdev->found->intinfos[intinfo].ctrl_transfer;
DEVUNLOCK(cgpu, pstate);
diff --git a/usbutils.h b/usbutils.h
index d4b872f..7c458d8 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -109,6 +109,9 @@
// Use the device defined timeout
#define DEVTIMEOUT 0
+// The default intinfo structure used is the first one
+#define DEFAULT_INTINFO 0
+
// For endpoints defined in usb_find_devices.intinfos.epinfos,
// the first two must be the default IN and OUT and both must always exist
#define DEFAULT_EP_IN 0
@@ -123,6 +126,7 @@ struct usb_epinfo {
struct usb_intinfo {
int interface;
+ int ctrl_transfer;
int epinfo_count;
struct usb_epinfo *epinfos;
};
@@ -159,7 +163,6 @@ struct usb_find_devices {
unsigned int timeout;
uint16_t wMaxPacketSize;
uint16_t latency;
- int which_intinfo;
int intinfo_count;
struct usb_intinfo *intinfos;
};
@@ -351,17 +354,17 @@ struct cgpu_info *usb_alloc_cgpu(struct device_drv *drv, int threads);
struct cgpu_info *usb_free_cgpu_devlock(struct cgpu_info *cgpu, bool free_devlock);
#define usb_free_cgpu(cgpu) usb_free_cgpu_devlock(cgpu, true)
void usb_uninit(struct cgpu_info *cgpu);
-struct cgpu_info *usb_init_intinfo(struct cgpu_info *orig, int intinfo);
bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found);
void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *));
struct api_data *api_usb_stats(int *count);
void update_usb_stats(struct cgpu_info *cgpu);
-int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *processed, unsigned int timeout, const char *end, enum usb_cmds cmd, bool readonce);
-int _usb_write(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *processed, unsigned int timeout, enum usb_cmds);
+int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t bufsiz, int *processed, unsigned int timeout, const char *end, enum usb_cmds cmd, bool readonce);
+int _usb_write(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t bufsiz, int *processed, unsigned int timeout, enum usb_cmds);
int _usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint32_t *data, int siz, unsigned int timeout, enum usb_cmds cmd);
int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, char *buf, int bufsiz, int *amount, unsigned int timeout, enum usb_cmds cmd);
int usb_ftdi_cts(struct cgpu_info *cgpu);
-int usb_ftdi_set_latency(struct cgpu_info *cgpu);
+int _usb_ftdi_set_latency(struct cgpu_info *cgpu, int intinfo);
+#define usb_ftdi_set_latency(_cgpu) _usb_ftdi_set_latency(_cgpu, DEFAULT_INTINFO)
void usb_buffer_enable(struct cgpu_info *cgpu);
void usb_buffer_disable(struct cgpu_info *cgpu);
void usb_buffer_clear(struct cgpu_info *cgpu);
@@ -369,7 +372,8 @@ uint32_t usb_buffer_size(struct cgpu_info *cgpu);
void usb_set_cps(struct cgpu_info *cgpu, int cps);
void usb_enable_cps(struct cgpu_info *cgpu);
void usb_disable_cps(struct cgpu_info *cgpu);
-int usb_interface(struct cgpu_info *cgpu);
+int _usb_interface(struct cgpu_info *cgpu, int intinfo);
+#define usb_interface(_cgpu) _usb_interface(_cgpu, DEFAULT_INTINFO)
enum sub_ident usb_ident(struct cgpu_info *cgpu);
void usb_set_pps(struct cgpu_info *cgpu, uint16_t PrefPacketSize);
void usb_set_dev_start(struct cgpu_info *cgpu);
@@ -378,46 +382,52 @@ void usb_initialise();
void *usb_resource_thread(void *userdata);
#define usb_read(cgpu, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false)
#define usb_read_once(cgpu, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, true)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, true)
#define usb_read_once_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, true)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, true)
#define usb_read_nl(cgpu, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, "\n", cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, "\n", cmd, false)
#define usb_read_nl_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, timeout, "\n", cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, "\n", cmd, false)
#define usb_read_ok(cgpu, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, "OK\n", cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, "OK\n", cmd, false)
#define usb_read_ok_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, timeout, "OK\n", cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, "OK\n", cmd, false)
#define usb_read_ep(cgpu, ep, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, ep, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, ep, buf, bufsiz, read, DEVTIMEOUT, NULL, cmd, false)
#define usb_read_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, false)
+
+#define usb_read_ii_timeout(cgpu, intinfo, buf, bufsiz, read, timeout, cmd) \
+ _usb_read(cgpu, intinfo, DEFAULT_EP_IN, buf, bufsiz, read, timeout, NULL, cmd, false)
#define usb_read_ep_timeout(cgpu, ep, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, ep, buf, bufsiz, read, timeout, NULL, cmd, false)
+ _usb_read(cgpu, DEFAULT_INTINFO, ep, buf, bufsiz, read, timeout, NULL, cmd, false)
#define usb_write(cgpu, buf, bufsiz, wrote, cmd) \
- _usb_write(cgpu, DEFAULT_EP_OUT, buf, bufsiz, wrote, DEVTIMEOUT, cmd)
+ _usb_write(cgpu, DEFAULT_INTINFO, DEFAULT_EP_OUT, buf, bufsiz, wrote, DEVTIMEOUT, cmd)
+
+#define usb_write_ii(cgpu, intinfo, buf, bufsiz, wrote, cmd) \
+ _usb_write(cgpu, intinfo, DEFAULT_EP_OUT, buf, bufsiz, wrote, DEVTIMEOUT, cmd)
#define usb_write_ep(cgpu, ep, buf, bufsiz, wrote, cmd) \
- _usb_write(cgpu, ep, buf, bufsiz, wrote, DEVTIMEOUT, cmd)
+ _usb_write(cgpu, DEFAULT_INTINFO, ep, buf, bufsiz, wrote, DEVTIMEOUT, cmd)
#define usb_write_timeout(cgpu, buf, bufsiz, wrote, timeout, cmd) \
- _usb_write(cgpu, DEFAULT_EP_OUT, buf, bufsiz, wrote, timeout, cmd)
+ _usb_write(cgpu, DEFAULT_INTINFO, DEFAULT_EP_OUT, buf, bufsiz, wrote, timeout, cmd)
#define usb_write_ep_timeout(cgpu, ep, buf, bufsiz, wrote, timeout, cmd) \
- _usb_write(cgpu, ep, buf, bufsiz, wrote, timeout, cmd)
+ _usb_write(cgpu, DEFAULT_INTINFO, ep, buf, bufsiz, wrote, timeout, cmd)
#define usb_transfer(cgpu, typ, req, val, idx, cmd) \
_usb_transfer(cgpu, typ, req, val, idx, NULL, 0, DEVTIMEOUT, cmd)