Commit 70b5b84052bd0ca700a5112e13568f845a3b6f30
2013-02-03T21:33:12
Merge branch 'master' of https://github.com/kanoi/cgminer into kanoi-usb
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 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483
diff --git a/API-README b/API-README
index b205c90..5fd2dda 100644
--- a/API-README
+++ b/API-README
@@ -347,6 +347,18 @@ The list of requests - a (*) means it requires privileged access - and replies a
The current options are:
MMQ opt=clock val=160 to 230 (and a multiple of 2)
+ zero|Which,true/false (*)
+ none There is no reply section just the STATUS section
+ stating that the zero, and optional summary, was done
+ If Which='all', all normal cgminer and API statistics
+ will be zeroed other than the numbers displayed by the
+ usbstats and stats commands
+ If Which='bestshare', only the 'Best Share' values
+ are zeroed for each pool and the global 'Best Share'
+ The true/false option determines if a full summary is
+ shown on the cgminer display like is normally displayed
+ on exit.
+
When you enable, disable or restart a GPU or PGA, you will also get Thread messages
in the cgminer status window
@@ -400,7 +412,18 @@ miner.php - an example web page to access the API
Feature Changelog for external applications using the API:
-API V1.23
+API V1.24
+
+Added API commands:
+ 'zero'
+
+Modified API commands:
+ 'pools' - add 'Best Share'
+ 'devs' and 'pga' - add 'No Device' for PGAs if MMQ or BFL compiled
+
+----------
+
+API V1.23 (cgminer v2.10.2)
Added API commands:
'pgaset' - with: MMQ opt=clock val=160 to 230 (and a multiple of 2)
@@ -931,6 +954,38 @@ true
---------
Default:
+ $userlist = null;
+
+Define password checking and default access
+ null means there is no password checking
+
+$userlist is an array of 3 arrays e.g.
+$userlist = array('sys' => array('boss' => 'bpass'),
+ 'usr' => array('user' => 'upass', 'pleb' => 'ppass'),
+ 'def' => array('Pools'));
+
+'sys' is an array of system users and passwords (full access)
+'usr' is an array of user level users and passwords (readonly access)
+'def' is an array of custompages that anyone not logged in can view
+
+Any of the 3 can be null, meaning there are none of that item
+
+All validated 'usr' users are given $readonly = true; access
+All validated 'sys' users are given the $readonly access you defined
+
+If 'def' has one or more values, and allowcustompages is true, then
+anyone without a password can see the list of custompage buttons given
+in 'def' and will see the first one when they go to the web page, with
+a login button at the top right
+
+From the login page, if you login with no username or password, it will
+show the first 'def' custompage (if there are any)
+
+If you are logged in, it will show a logout button at the top right
+
+---------
+
+Default:
$notify = true;
Set $notify to false to NOT attempt to display the notify command
diff --git a/FPGA-README b/FPGA-README
index a970df7..5a1e6a3 100644
--- a/FPGA-README
+++ b/FPGA-README
@@ -2,15 +2,8 @@
This README contains extended details about FPGA mining with cgminer
-ModMinerQuad (MMQ)
-------------------
-
-The mining bitstream does not survive a power cycle, so cgminer will upload
-it, if it needs to, before it starts mining (approx 7min 40sec)
-
-The red LED also flashes while it is uploading the bitstream
-
--
+For ModMinerQuad (MMQ) and BitForce (BFL)
+-----------------------------------------
When mining on windows, the driver being used will determine if mining will work.
@@ -39,7 +32,17 @@ problems:
--usb-dump 0
-It will only help if you have a working MMQ device attached to the computer
+It will only help if you have a working MMQ or BFL device attached to the
+computer
+
+
+ModMinerQuad (MMQ)
+------------------
+
+The mining bitstream does not survive a power cycle, so cgminer will upload
+it, if it needs to, before it starts mining (approx 7min 40sec)
+
+The red LED also flashes while it is uploading the bitstream
-
@@ -130,7 +133,7 @@ modem-manager software
TODO: check that all MMQ's have the same product ID
-Bitforce (BFL)
+BitForce (BFL)
--------------
--bfl-range Use nonce range on bitforce devices if supported
diff --git a/Makefile.am b/Makefile.am
index 5f84628..b7f9063 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,10 @@ if NEED_FPGAUTILS
cgminer_SOURCES += fpgautils.c fpgautils.h
endif
+if NEED_USBUTILS_C
+cgminer_SOURCES += usbutils.c
+endif
+
if HAS_BITFORCE
cgminer_SOURCES += driver-bitforce.c
endif
@@ -91,7 +95,7 @@ cgminer_SOURCES += driver-icarus.c
endif
if HAS_MODMINER
-cgminer_SOURCES += driver-modminer.c usbutils.c
+cgminer_SOURCES += driver-modminer.c
bitstreamsdir = $(bindir)/bitstreams
dist_bitstreams_DATA = bitstreams/*
endif
diff --git a/README b/README
index 8865529..21f1296 100644
--- a/README
+++ b/README
@@ -220,15 +220,16 @@ SCRYPT only options:
See SCRYPT-README for more information regarding litecoin mining.
-FPGA mining boards(BitForce, Icarus, ModMiner, Ztex) only options:
+FPGA mining boards (BitForce, Icarus, ModMiner, Ztex) only options:
-cgminer will automatically find your ModMiner or Ztex FPGAs
+cgminer will automatically find your ModMiner, BitForce or Ztex FPGAs
+independent of the --scan-serial options specified below
---scan-serial|-S <arg> Serial port to probe for FPGA mining device
+--scan-serial|-S <arg> Serial port to probe for Icarus mining device
-This option is only for BitForce and/or Icarus FPGAs
+This option is only for Icarus bitstream FPGAs
-By default, cgminer will scan for autodetected FPGAs unless at least one
+By default, cgminer will scan for autodetected Icarus unless at least one
-S is specified for that driver. If you specify -S and still want cgminer
to scan, you must also use "-S auto". If you want to prevent cgminer from
scanning without specifying a device, you can use "-S noauto". Note that
@@ -237,13 +238,14 @@ device depending on the version of udev being used.
On linux <arg> is usually of the format /dev/ttyUSBn
On windows <arg> is usually of the format \\.\COMn
-(where n = the correct device number for the FPGA device)
+(where n = the correct device number for the Icarus device)
The official supplied binaries are compiled with support for all FPGAs.
To force the code to only attempt detection with a specific driver,
prepend the argument with the driver name followed by a colon.
-For example, "icarus:/dev/ttyUSB0" or "bitforce:\\.\COM5"
-or using the short name: "ica:/dev/ttyUSB0" or "bfl:\\.\COM5"
+For example, "icarus:/dev/ttyUSB0" or using the short name: "ica:/dev/ttyUSB0"
+This option not longer matters since Icarus is the only serial-USB
+device that uses it
For other FPGA details see the FPGA-README
@@ -455,7 +457,7 @@ The block display shows:
Block: 0074c5e482e34a506d2a051a... Started: [17:17:22] Best share: 2.71K
This shows a short stretch of the current block, when the new block started,
-and the all time best difficulty share you've submitted since starting cgminer
+and the all time best difficulty share you've found since starting cgminer
this time.
diff --git a/api.c b/api.c
index 659d934..4998d97 100644
--- a/api.c
+++ b/api.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2012 Andrew Smith
+ * Copyright 2011-2013 Andrew Smith
* Copyright 2011-2012 Con Kolivas
*
* This program is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@ static const char SEPARATOR = '|';
#define SEPSTR "|"
static const char GPUSEP = ',';
-static const char *APIVERSION = "1.23";
+static const char *APIVERSION = "1.24";
static const char *DEAD = "Dead";
#if defined(HAVE_OPENCL) || defined(HAVE_AN_FPGA)
static const char *SICK = "Sick";
@@ -387,6 +387,12 @@ static const char *JSON_PARAMETER = "parameter";
#define MSG_PGASETERR 93
#endif
+#define MSG_ZERMIS 94
+#define MSG_ZERINV 95
+#define MSG_ZERSUM 96
+#define MSG_ZERNOSUM 97
+#define MSG_USBNODEV 98
+
enum code_severity {
SEVERITY_ERR,
SEVERITY_WARN,
@@ -559,6 +565,13 @@ struct CODES {
{ SEVERITY_SUCC, MSG_PGASETOK, PARAM_BOTH, "PGA %d set OK" },
{ SEVERITY_ERR, MSG_PGASETERR, PARAM_BOTH, "PGA %d set failed: %s" },
#endif
+ { SEVERITY_ERR, MSG_ZERMIS, PARAM_NONE, "Missing zero parameters" },
+ { SEVERITY_ERR, MSG_ZERINV, PARAM_STR, "Invalid zero parameter '%s'" },
+ { SEVERITY_SUCC, MSG_ZERSUM, PARAM_STR, "Zeroed %s stats with summary" },
+ { SEVERITY_SUCC, MSG_ZERNOSUM, PARAM_STR, "Zeroed %s stats without summary" },
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
+ { SEVERITY_ERR, MSG_USBNODEV, PARAM_PGA, "PGA%d has no device" },
+#endif
{ SEVERITY_FAIL, 0, 0, NULL }
};
@@ -599,22 +612,6 @@ struct APIGROUPS {
static struct IP4ACCESS *ipaccess = NULL;
static int ips = 0;
-#ifdef USE_BITFORCE
-extern struct device_api bitforce_api;
-#endif
-
-#ifdef USE_ICARUS
-extern struct device_api icarus_api;
-#endif
-
-#ifdef USE_ZTEX
-extern struct device_api ztex_api;
-#endif
-
-#ifdef USE_MODMINER
-extern struct device_api modminer_api;
-#endif
-
struct io_data {
size_t siz;
char *ptr;
@@ -1153,19 +1150,19 @@ static int numpgas()
for (i = 0; i < total_devices; i++) {
#ifdef USE_BITFORCE
- if (devices[i]->api == &bitforce_api)
+ if (devices[i]->drv->drv == DRIVER_BITFORCE)
count++;
#endif
#ifdef USE_ICARUS
- if (devices[i]->api == &icarus_api)
+ if (devices[i]->drv->drv == DRIVER_ICARUS)
count++;
#endif
#ifdef USE_ZTEX
- if (devices[i]->api == &ztex_api)
+ if (devices[i]->drv->drv == DRIVER_ZTEX)
count++;
#endif
#ifdef USE_MODMINER
- if (devices[i]->api == &modminer_api)
+ if (devices[i]->drv->drv == DRIVER_MODMINER)
count++;
#endif
}
@@ -1179,19 +1176,19 @@ static int pgadevice(int pgaid)
for (i = 0; i < total_devices; i++) {
#ifdef USE_BITFORCE
- if (devices[i]->api == &bitforce_api)
+ if (devices[i]->drv->drv == DRIVER_BITFORCE)
count++;
#endif
#ifdef USE_ICARUS
- if (devices[i]->api == &icarus_api)
+ if (devices[i]->drv->drv == DRIVER_ICARUS)
count++;
#endif
#ifdef USE_ZTEX
- if (devices[i]->api == &ztex_api)
+ if (devices[i]->drv->drv == DRIVER_ZTEX)
count++;
#endif
#ifdef USE_MODMINER
- if (devices[i]->api == &modminer_api)
+ if (devices[i]->drv->drv == DRIVER_MODMINER)
count++;
#endif
if (count == (pgaid + 1))
@@ -1535,11 +1532,11 @@ static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom
float temp = cgpu->temp;
#ifdef USE_ZTEX
- if (cgpu->api == &ztex_api && cgpu->device_ztex)
+ if (cgpu->drv->drv == DRIVER_ZTEX && cgpu->device_ztex)
frequency = cgpu->device_ztex->freqM1 * (cgpu->device_ztex->freqM + 1);
#endif
#ifdef USE_MODMINER
- if (cgpu->api == &modminer_api)
+ if (cgpu->drv->drv == DRIVER_MODMINER)
frequency = cgpu->clock;
#endif
@@ -1553,7 +1550,7 @@ static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom
status = (char *)status2str(cgpu->status);
root = api_add_int(root, "PGA", &pga, false);
- root = api_add_string(root, "Name", cgpu->api->name, false);
+ root = api_add_string(root, "Name", cgpu->drv->name, false);
root = api_add_int(root, "ID", &(cgpu->device_id), false);
root = api_add_string(root, "Enabled", enabled, false);
root = api_add_string(root, "Status", status, false);
@@ -1577,6 +1574,9 @@ static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom
root = api_add_diff(root, "Difficulty Accepted", &(cgpu->diff_accepted), false);
root = api_add_diff(root, "Difficulty Rejected", &(cgpu->diff_rejected), false);
root = api_add_diff(root, "Last Share Difficulty", &(cgpu->last_share_diff), false);
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
+ root = api_add_bool(root, "No Device", &(cgpu->usbinfo.nodev), false);
+#endif
root = print_data(root, buf, isjson, precom);
io_add(io_data, buf);
@@ -1777,6 +1777,9 @@ static void pgaenable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char
struct cgpu_info *cgpu = devices[dev];
+ applog(LOG_DEBUG, "API: request to pgaenable pgaid %d device %d %s%u",
+ id, dev, cgpu->drv->name, cgpu->device_id);
+
if (cgpu->deven != DEV_DISABLED) {
message(io_data, MSG_PGALRENA, id, NULL, isjson);
return;
@@ -1789,11 +1792,21 @@ static void pgaenable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char
}
#endif
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
+ if (cgpu->usbinfo.nodev) {
+ message(io_data, MSG_USBNODEV, id, NULL, isjson);
+ return;
+ }
+#endif
+
for (i = 0; i < mining_threads; i++) {
- pga = thr_info[i].cgpu->device_id;
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
+ pga = thr->cgpu->cgminer_id;
if (pga == dev) {
- thr = &thr_info[i];
cgpu->deven = DEV_ENABLED;
+ applog(LOG_DEBUG, "API: pushing ping (%d) to thread %d", ping, thr->id);
tq_push(thr->q, &ping);
}
}
@@ -1830,6 +1843,9 @@ static void pgadisable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, cha
struct cgpu_info *cgpu = devices[dev];
+ applog(LOG_DEBUG, "API: request to pgadisable pgaid %d device %d %s%u",
+ id, dev, cgpu->drv->name, cgpu->device_id);
+
if (cgpu->deven == DEV_DISABLED) {
message(io_data, MSG_PGALRDIS, id, NULL, isjson);
return;
@@ -1868,12 +1884,12 @@ static void pgaidentify(struct io_data *io_data, __maybe_unused SOCKETTYPE c, ch
}
struct cgpu_info *cgpu = devices[dev];
- struct device_api *api = cgpu->api;
+ struct device_drv *drv = cgpu->drv;
- if (!api->identify_device)
+ if (!drv->identify_device)
message(io_data, MSG_PGANOID, id, NULL, isjson);
else {
- api->identify_device(cgpu);
+ drv->identify_device(cgpu);
message(io_data, MSG_PGAIDENT, id, NULL, isjson);
}
}
@@ -1993,6 +2009,7 @@ static void poolstatus(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
else
root = api_add_const(root, "Stratum URL", BLANK, false);
root = api_add_bool(root, "Has GBT", &(pool->has_gbt), false);
+ root = api_add_uint64(root, "Best Share", &(pool->best_diff), true);
root = print_data(root, buf, isjson, isjson && (i > 0));
io_add(io_data, buf);
@@ -2081,23 +2098,27 @@ static void gpuenable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char
return;
}
+ applog(LOG_DEBUG, "API: request to gpuenable gpuid %d %s%u",
+ id, gpus[id].drv->name, gpus[id].device_id);
+
if (gpus[id].deven != DEV_DISABLED) {
message(io_data, MSG_ALRENA, id, NULL, isjson);
return;
}
for (i = 0; i < gpu_threads; i++) {
- gpu = thr_info[i].cgpu->device_id;
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
+ gpu = thr->cgpu->device_id;
if (gpu == id) {
- thr = &thr_info[i];
if (thr->cgpu->status != LIFE_WELL) {
message(io_data, MSG_GPUMRE, id, NULL, isjson);
return;
}
-
gpus[id].deven = DEV_ENABLED;
+ applog(LOG_DEBUG, "API: pushing ping (%d) to thread %d", ping, thr->id);
tq_push(thr->q, &ping);
-
}
}
@@ -2124,6 +2145,9 @@ static void gpudisable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, cha
return;
}
+ applog(LOG_DEBUG, "API: request to gpudisable gpuid %d %s%u",
+ id, gpus[id].drv->name, gpus[id].device_id);
+
if (gpus[id].deven == DEV_DISABLED) {
message(io_data, MSG_ALRDIS, id, NULL, isjson);
return;
@@ -2752,7 +2776,7 @@ void notifystatus(struct io_data *io_data, int device, struct cgpu_info *cgpu, b
// ALL counters (and only counters) must start the name with a '*'
// Simplifies future external support for identifying new counters
root = api_add_int(root, "NOTIFY", &device, false);
- root = api_add_string(root, "Name", cgpu->api->name, false);
+ root = api_add_string(root, "Name", cgpu->drv->name, false);
root = api_add_int(root, "ID", &(cgpu->device_id), false);
root = api_add_time(root, "Last Well", &(cgpu->device_last_well), false);
root = api_add_time(root, "Last Not Well", &(cgpu->device_last_not_well), false);
@@ -2816,9 +2840,9 @@ static void devdetails(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
cgpu = devices[i];
root = api_add_int(root, "DEVDETAILS", &i, false);
- root = api_add_string(root, "Name", cgpu->api->name, false);
+ root = api_add_string(root, "Name", cgpu->drv->name, false);
root = api_add_int(root, "ID", &(cgpu->device_id), false);
- root = api_add_string(root, "Driver", cgpu->api->dname, false);
+ root = api_add_string(root, "Driver", cgpu->drv->dname, false);
root = api_add_const(root, "Kernel", cgpu->kname ? : BLANK, false);
root = api_add_const(root, "Model", cgpu->name ? : BLANK, false);
root = api_add_const(root, "Device Path", cgpu->device_path ? : BLANK, false);
@@ -2895,6 +2919,8 @@ static int itemstats(struct io_data *io_data, int i, char *id, struct cgminer_st
root = api_add_uint64(root, "Bytes Sent", &(pool_stats->bytes_sent), false);
root = api_add_uint64(root, "Times Recv", &(pool_stats->times_received), false);
root = api_add_uint64(root, "Bytes Recv", &(pool_stats->bytes_received), false);
+ root = api_add_uint64(root, "Net Bytes Sent", &(pool_stats->net_bytes_sent), false);
+ root = api_add_uint64(root, "Net Bytes Recv", &(pool_stats->net_bytes_received), false);
}
if (extra)
@@ -2922,13 +2948,13 @@ static void minerstats(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
for (j = 0; j < total_devices; j++) {
struct cgpu_info *cgpu = devices[j];
- if (cgpu && cgpu->api) {
- if (cgpu->api->get_api_stats)
- extra = cgpu->api->get_api_stats(cgpu);
+ if (cgpu && cgpu->drv) {
+ if (cgpu->drv->get_api_stats)
+ extra = cgpu->drv->get_api_stats(cgpu);
else
extra = NULL;
- sprintf(id, "%s%d", cgpu->api->name, cgpu->device_id);
+ sprintf(id, "%s%d", cgpu->drv->name, cgpu->device_id);
i = itemstats(io_data, i, id, &(cgpu->cgminer_stats), NULL, extra, isjson);
}
}
@@ -3120,7 +3146,7 @@ static void usbstats(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __may
{
struct api_data *root = NULL;
-#ifdef USE_MODMINER
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
char buf[TMPBUFSIZ];
bool io_open = false;
int count = 0;
@@ -3133,7 +3159,7 @@ static void usbstats(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __may
return;
}
-#ifdef USE_MODMINER
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
message(io_data, MSG_USBSTA, 0, NULL, isjson);
@@ -3194,16 +3220,16 @@ static void pgaset(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe
}
struct cgpu_info *cgpu = devices[dev];
- struct device_api *api = cgpu->api;
+ struct device_drv *drv = cgpu->drv;
char *set = strchr(opt, ',');
if (set)
*(set++) = '\0';
- if (!api->set_device)
+ if (!drv->set_device)
message(io_data, MSG_PGANOSET, id, NULL, isjson);
else {
- char *ret = api->set_device(cgpu, opt, set, buf);
+ char *ret = drv->set_device(cgpu, opt, set, buf);
if (ret) {
if (strcasecmp(opt, "help") == 0)
message(io_data, MSG_PGAHELP, id, ret, isjson);
@@ -3215,6 +3241,54 @@ static void pgaset(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe
}
#endif
+static void dozero(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+{
+ if (param == NULL || *param == '\0') {
+ message(io_data, MSG_ZERMIS, 0, NULL, isjson);
+ return;
+ }
+
+ char *sum = strchr(param, ',');
+ if (sum)
+ *(sum++) = '\0';
+ if (!sum || !*sum) {
+ message(io_data, MSG_MISBOOL, 0, NULL, isjson);
+ return;
+ }
+
+ bool all = false;
+ bool bs = false;
+ if (strcasecmp(param, "all") == 0)
+ all = true;
+ else if (strcasecmp(param, "bestshare") == 0)
+ bs = true;
+
+ if (all == false && bs == false) {
+ message(io_data, MSG_ZERINV, 0, param, isjson);
+ return;
+ }
+
+ *sum = tolower(*sum);
+ if (*sum != 't' && *sum != 'f') {
+ message(io_data, MSG_INVBOOL, 0, NULL, isjson);
+ return;
+ }
+
+ bool dosum = (*sum == 't');
+ if (dosum)
+ print_summary();
+
+ if (all)
+ zero_stats();
+ if (bs)
+ zero_bestshare();
+
+ if (dosum)
+ message(io_data, MSG_ZERSUM, 0, all ? "All" : "BestShare", isjson);
+ else
+ message(io_data, MSG_ZERNOSUM, 0, all ? "All" : "BestShare", isjson);
+}
+
static void checkcommand(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, char group);
struct CMDS {
@@ -3274,6 +3348,7 @@ struct CMDS {
#ifdef HAVE_AN_FPGA
{ "pgaset", pgaset, true },
#endif
+ { "zero", dozero, true },
{ NULL, NULL, false }
};
diff --git a/cgminer.c b/cgminer.c
index 2fe8ee6..366eee0 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -146,7 +146,8 @@ bool opt_bfl_noncerange;
#endif
#define QUIET (opt_quiet || opt_realquiet)
-struct thr_info *thr_info;
+struct thr_info *control_thr;
+struct thr_info **mining_thr;
static int gwsched_thr_id;
static int stage_thr_id;
static int watchpool_thr_id;
@@ -156,7 +157,7 @@ static int input_thr_id;
#endif
int gpur_thr_id;
static int api_thr_id;
-static int total_threads;
+static int total_control_threads;
#ifdef HAVE_LIBUSB
pthread_mutex_t cgusb_lock;
@@ -171,6 +172,7 @@ static pthread_rwlock_t blk_lock;
static pthread_mutex_t sshare_lock;
pthread_rwlock_t netacc_lock;
+pthread_mutex_t mining_thr_lock;
static pthread_mutex_t lp_lock;
static pthread_cond_t lp_cond;
@@ -377,7 +379,9 @@ static void sharelog(const char*disposition, const struct work*work)
return;
thr_id = work->thr_id;
- cgpu = thr_info[thr_id].cgpu;
+ mutex_lock(&mining_thr_lock);
+ cgpu = mining_thr[thr_id]->cgpu;
+ mutex_unlock(&mining_thr_lock);
pool = work->pool;
t = (unsigned long int)(work->tv_work_found.tv_sec);
target = bin2hex(work->target, sizeof(work->target));
@@ -385,7 +389,7 @@ static void sharelog(const char*disposition, const struct work*work)
data = bin2hex(work->data, sizeof(work->data));
// timestamp,disposition,target,pool,dev,thr,sharehash,sharedata
- rv = snprintf(s, sizeof(s), "%lu,%s,%s,%s,%s%u,%u,%s,%s\n", t, disposition, target, pool->rpc_url, cgpu->api->name, cgpu->device_id, thr_id, hash, data);
+ rv = snprintf(s, sizeof(s), "%lu,%s,%s,%s,%s%u,%u,%s,%s\n", t, disposition, target, pool->rpc_url, cgpu->drv->name, cgpu->device_id, thr_id, hash, data);
free(target);
free(hash);
free(data);
@@ -1722,7 +1726,13 @@ out:
int dev_from_id(int thr_id)
{
- return thr_info[thr_id].cgpu->device_id;
+ struct cgpu_info *cgpu;
+
+ mutex_lock(&mining_thr_lock);
+ cgpu = mining_thr[thr_id]->cgpu;
+ mutex_unlock(&mining_thr_lock);
+
+ return cgpu->device_id;
}
/* Make the change in the recent value adjust dynamically when the difference
@@ -1875,9 +1885,9 @@ static void get_statline(char *buf, struct cgpu_info *cgpu)
suffix_string(dh64, displayed_hashes, 4);
suffix_string(dr64, displayed_rolling, 4);
- sprintf(buf, "%s%d ", cgpu->api->name, cgpu->device_id);
- if (cgpu->api->get_statline_before)
- cgpu->api->get_statline_before(buf, cgpu);
+ sprintf(buf, "%s%d ", cgpu->drv->name, cgpu->device_id);
+ if (cgpu->drv->get_statline_before)
+ cgpu->drv->get_statline_before(buf, cgpu);
else
tailsprintf(buf, " | ");
tailsprintf(buf, "(%ds):%s (avg):%sh/s | A:%d R:%d HW:%d U:%.1f/m",
@@ -1888,15 +1898,19 @@ static void get_statline(char *buf, struct cgpu_info *cgpu)
cgpu->rejected,
cgpu->hw_errors,
cgpu->utility);
- if (cgpu->api->get_statline)
- cgpu->api->get_statline(buf, cgpu);
+ if (cgpu->drv->get_statline)
+ cgpu->drv->get_statline(buf, cgpu);
}
static void text_print_status(int thr_id)
{
- struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
+ struct cgpu_info *cgpu;
char logline[256];
+ mutex_lock(&mining_thr_lock);
+ cgpu = mining_thr[thr_id]->cgpu;
+ mutex_unlock(&mining_thr_lock);
+
if (cgpu) {
get_statline(logline, cgpu);
printf("%s\n", logline);
@@ -1960,21 +1974,25 @@ static int dev_width;
static void curses_print_devstatus(int thr_id)
{
static int awidth = 1, rwidth = 1, hwwidth = 1, uwidth = 1;
- struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
+ struct cgpu_info *cgpu;
char logline[256];
char displayed_hashes[16], displayed_rolling[16];
uint64_t dh64, dr64;
+ mutex_lock(&mining_thr_lock);
+ cgpu = mining_thr[thr_id]->cgpu;
+ mutex_unlock(&mining_thr_lock);
+
if (devcursor + cgpu->cgminer_id > LINES - 2 || opt_compact)
return;
cgpu->utility = cgpu->accepted / total_secs * 60;
wmove(statuswin,devcursor + cgpu->cgminer_id, 0);
- wprintw(statuswin, " %s %*d: ", cgpu->api->name, dev_width, cgpu->device_id);
- if (cgpu->api->get_statline_before) {
+ wprintw(statuswin, " %s %*d: ", cgpu->drv->name, dev_width, cgpu->device_id);
+ if (cgpu->drv->get_statline_before) {
logline[0] = '\0';
- cgpu->api->get_statline_before(logline, cgpu);
+ cgpu->drv->get_statline_before(logline, cgpu);
wprintw(statuswin, "%s", logline);
}
else
@@ -1986,11 +2004,11 @@ static void curses_print_devstatus(int thr_id)
suffix_string(dr64, displayed_rolling, 4);
if (cgpu->status == LIFE_DEAD)
- wprintw(statuswin, "DEAD ");
+ wprintw(statuswin, "DEAD ");
else if (cgpu->status == LIFE_SICK)
- wprintw(statuswin, "SICK ");
+ wprintw(statuswin, "SICK ");
else if (cgpu->deven == DEV_DISABLED)
- wprintw(statuswin, "OFF ");
+ wprintw(statuswin, "OFF ");
else if (cgpu->deven == DEV_RECOVER)
wprintw(statuswin, "REST ");
else
@@ -2007,9 +2025,9 @@ static void curses_print_devstatus(int thr_id)
hwwidth, cgpu->hw_errors,
uwidth + 3, cgpu->utility);
- if (cgpu->api->get_statline) {
+ if (cgpu->drv->get_statline) {
logline[0] = '\0';
- cgpu->api->get_statline(logline, cgpu);
+ cgpu->drv->get_statline(logline, cgpu);
wprintw(statuswin, "%s", logline);
}
@@ -2212,7 +2230,11 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work,
char *hashshow, bool resubmit, char *worktime)
{
struct pool *pool = work->pool;
- struct cgpu_info *cgpu = thr_info[work->thr_id].cgpu;
+ struct cgpu_info *cgpu;
+
+ mutex_lock(&mining_thr_lock);
+ cgpu = mining_thr[work->thr_id]->cgpu;
+ mutex_unlock(&mining_thr_lock);
if (json_is_true(res) || (work->gbt && json_is_null(res))) {
mutex_lock(&stats_lock);
@@ -2234,10 +2256,10 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work,
if (!QUIET) {
if (total_pools > 1)
applog(LOG_NOTICE, "Accepted %s %s %d pool %d %s%s",
- hashshow, cgpu->api->name, cgpu->device_id, work->pool->pool_no, resubmit ? "(resubmit)" : "", worktime);
+ hashshow, cgpu->drv->name, cgpu->device_id, work->pool->pool_no, resubmit ? "(resubmit)" : "", worktime);
else
applog(LOG_NOTICE, "Accepted %s %s %d %s%s",
- hashshow, cgpu->api->name, cgpu->device_id, resubmit ? "(resubmit)" : "", worktime);
+ hashshow, cgpu->drv->name, cgpu->device_id, resubmit ? "(resubmit)" : "", worktime);
}
sharelog("accept", work);
if (opt_shares && total_accepted >= opt_shares) {
@@ -2302,7 +2324,7 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work,
}
applog(LOG_NOTICE, "Rejected %s %s %d %s%s %s%s",
- hashshow, cgpu->api->name, cgpu->device_id, where, reason, resubmit ? "(resubmit)" : "", worktime);
+ hashshow, cgpu->drv->name, cgpu->device_id, where, reason, resubmit ? "(resubmit)" : "", worktime);
sharelog(disposition, work);
}
@@ -2349,6 +2371,8 @@ static uint64_t share_diff(const struct work *work)
best_diff = ret;
suffix_string(best_diff, best_share, 0);
}
+ if (ret > work->pool->best_diff)
+ work->pool->best_diff = ret;
mutex_unlock(&control_lock);
return ret;
}
@@ -2360,13 +2384,17 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
char *s;
bool rc = false;
int thr_id = work->thr_id;
- struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
+ struct cgpu_info *cgpu;
struct pool *pool = work->pool;
int rolltime;
struct timeval tv_submit, tv_submit_reply;
char hashshow[64 + 4] = "";
char worktime[200] = "";
+ mutex_lock(&mining_thr_lock);
+ cgpu = mining_thr[thr_id]->cgpu;
+ mutex_unlock(&mining_thr_lock);
+
#ifdef __BIG_ENDIAN__
int swapcounter = 0;
for (swapcounter = 0; swapcounter < 32; swapcounter++)
@@ -2574,7 +2602,7 @@ static inline struct pool *select_pool(bool lagging)
return pool;
}
-static double DIFFEXACTONE = 26959946667150639794667015087019630673637144422540572481103610249216.0;
+static double DIFFEXACTONE = 26959946667150639794667015087019630673637144422540572481103610249215.0;
/*
* Calculate the work share difficulty
@@ -2730,8 +2758,6 @@ static void disable_curses(void)
}
#endif
-static void print_summary(void);
-
static void __kill_work(void)
{
struct thr_info *thr;
@@ -2744,18 +2770,20 @@ static void __kill_work(void)
applog(LOG_DEBUG, "Killing off watchpool thread");
/* Kill the watchpool thread */
- thr = &thr_info[watchpool_thr_id];
+ thr = &control_thr[watchpool_thr_id];
thr_info_cancel(thr);
applog(LOG_DEBUG, "Killing off watchdog thread");
/* Kill the watchdog thread */
- thr = &thr_info[watchdog_thr_id];
+ thr = &control_thr[watchdog_thr_id];
thr_info_cancel(thr);
applog(LOG_DEBUG, "Stopping mining threads");
/* Stop the mining threads*/
for (i = 0; i < mining_threads; i++) {
- thr = &thr_info[i];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
thr_info_freeze(thr);
thr->pause = true;
}
@@ -2765,17 +2793,19 @@ static void __kill_work(void)
applog(LOG_DEBUG, "Killing off mining threads");
/* Kill the mining threads*/
for (i = 0; i < mining_threads; i++) {
- thr = &thr_info[i];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
thr_info_cancel(thr);
}
applog(LOG_DEBUG, "Killing off stage thread");
/* Stop the others */
- thr = &thr_info[stage_thr_id];
+ thr = &control_thr[stage_thr_id];
thr_info_cancel(thr);
applog(LOG_DEBUG, "Killing off API thread");
- thr = &thr_info[api_thr_id];
+ thr = &control_thr[api_thr_id];
thr_info_cancel(thr);
}
@@ -3369,8 +3399,10 @@ static void restart_threads(void)
/* Discard staged work that is now stale */
discard_stale();
+ mutex_lock(&mining_thr_lock);
for (i = 0; i < mining_threads; i++)
- thr_info[i].work_restart = true;
+ mining_thr[i]->work_restart = true;
+ mutex_unlock(&mining_thr_lock);
mutex_lock(&restart_lock);
pthread_cond_broadcast(&restart_cond);
@@ -3914,6 +3946,20 @@ void write_config(FILE *fcfg)
json_escape_free();
}
+void zero_bestshare(void)
+{
+ int i;
+
+ best_diff = 0;
+ memset(best_share, 0, 8);
+ suffix_string(best_diff, best_share, 0);
+
+ for (i = 0; i < total_pools; i++) {
+ struct pool *pool = pools[i];
+ pool->best_diff = 0;
+ }
+}
+
void zero_stats(void)
{
int i;
@@ -3930,10 +3976,11 @@ void zero_stats(void)
total_go = 0;
total_ro = 0;
total_secs = 1.0;
- best_diff = 0;
total_diff1 = 0;
- memset(best_share, 0, 8);
- suffix_string(best_diff, best_share, 0);
+ found_blocks = 0;
+ total_diff_accepted = 0;
+ total_diff_rejected = 0;
+ total_diff_stale = 0;
for (i = 0; i < total_pools; i++) {
struct pool *pool = pools[i];
@@ -3945,8 +3992,16 @@ void zero_stats(void)
pool->discarded_work = 0;
pool->getfail_occasions = 0;
pool->remotefail_occasions = 0;
+ pool->last_share_time = 0;
+ pool->diff1 = 0;
+ pool->diff_accepted = 0;
+ pool->diff_rejected = 0;
+ pool->diff_stale = 0;
+ pool->last_share_diff = 0;
}
+ zero_bestshare();
+
mutex_lock(&hash_lock);
for (i = 0; i < total_devices; ++i) {
struct cgpu_info *cgpu = devices[i];
@@ -3956,6 +4011,11 @@ void zero_stats(void)
cgpu->rejected = 0;
cgpu->hw_errors = 0;
cgpu->utility = 0.0;
+ cgpu->last_share_pool_time = 0;
+ cgpu->diff1 = 0;
+ cgpu->diff_accepted = 0;
+ cgpu->diff_rejected = 0;
+ cgpu->last_share_diff = 0;
}
mutex_unlock(&hash_lock);
}
@@ -4378,20 +4438,23 @@ static void hashmeter(int thr_id, struct timeval *diff,
bool showlog = false;
char displayed_hashes[16], displayed_rolling[16];
uint64_t dh64, dr64;
+ struct thr_info *thr;
local_mhashes = (double)hashes_done / 1000000.0;
/* Update the last time this thread reported in */
if (thr_id >= 0) {
- gettimeofday(&thr_info[thr_id].last, NULL);
- thr_info[thr_id].cgpu->device_last_well = time(NULL);
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[thr_id];
+ mutex_unlock(&mining_thr_lock);
+ gettimeofday(&(thr->last), NULL);
+ thr->cgpu->device_last_well = time(NULL);
}
secs = (double)diff->tv_sec + ((double)diff->tv_usec / 1000000.0);
/* So we can call hashmeter from a non worker thread */
if (thr_id >= 0) {
- struct thr_info *thr = &thr_info[thr_id];
- struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
+ struct cgpu_info *cgpu = thr->cgpu;
double thread_rolling = 0.0;
int i;
@@ -4574,8 +4637,8 @@ static void clear_stratum_shares(struct pool *pool)
if (cleared) {
applog(LOG_WARNING, "Lost %d shares due to stratum disconnect on pool %d", cleared, pool->pool_no);
- pool->stale_shares++;
- total_stale++;
+ pool->stale_shares += cleared;
+ total_stale += cleared;
}
}
@@ -4881,7 +4944,7 @@ retry_stratum:
calc_diff(work, 0);
applog(LOG_DEBUG, "Pushing pooltest work to base pool");
- tq_push(thr_info[stage_thr_id].q, work);
+ tq_push(control_thr[stage_thr_id].q, work);
total_getworks++;
pool->getwork_requested++;
ret = true;
@@ -5221,15 +5284,15 @@ static bool hashtest(struct thr_info *thr, struct work *work)
if (hash2_32[7] != 0) {
applog(LOG_WARNING, "%s%d: invalid nonce - HW error",
- thr->cgpu->api->name, thr->cgpu->device_id);
+ thr->cgpu->drv->name, thr->cgpu->device_id);
mutex_lock(&stats_lock);
hw_errors++;
thr->cgpu->hw_errors++;
mutex_unlock(&stats_lock);
- if (thr->cgpu->api->hw_error)
- thr->cgpu->api->hw_error(thr);
+ if (thr->cgpu->drv->hw_error)
+ thr->cgpu->drv->hw_error(thr);
goto out;
}
@@ -5277,7 +5340,7 @@ static inline bool abandon_work(struct work *work, struct timeval *wdiff, uint64
}
static void mt_disable(struct thr_info *mythr, const int thr_id,
- struct device_api *api)
+ struct device_drv *drv)
{
applog(LOG_WARNING, "Thread %d being disabled", thr_id);
mythr->rolling = mythr->cgpu->rolling = 0;
@@ -5288,8 +5351,8 @@ static void mt_disable(struct thr_info *mythr, const int thr_id,
} while (mythr->pause);
thread_reportin(mythr);
applog(LOG_WARNING, "Thread %d being re-enabled", thr_id);
- if (api->thread_enable)
- api->thread_enable(mythr);
+ if (drv->thread_enable)
+ drv->thread_enable(mythr);
}
void *miner_thread(void *userdata)
@@ -5297,7 +5360,7 @@ void *miner_thread(void *userdata)
struct thr_info *mythr = userdata;
const int thr_id = mythr->id;
struct cgpu_info *cgpu = mythr->cgpu;
- struct device_api *api = cgpu->api;
+ struct device_drv *drv = cgpu->drv;
struct cgminer_stats *dev_stats = &(cgpu->cgminer_stats);
struct cgminer_stats *pool_stats;
struct timeval getwork_start;
@@ -5306,7 +5369,7 @@ void *miner_thread(void *userdata)
const long cycle = opt_log_interval / 5 ? : 1;
struct timeval tv_start, tv_end, tv_workstart, tv_lastupdate;
struct timeval diff, sdiff, wdiff = {0, 0};
- uint32_t max_nonce = api->can_limit_work ? api->can_limit_work(mythr) : 0xffffffff;
+ uint32_t max_nonce = drv->can_limit_work ? drv->can_limit_work(mythr) : 0xffffffff;
int64_t hashes_done = 0;
int64_t hashes;
struct work *work;
@@ -5320,7 +5383,7 @@ void *miner_thread(void *userdata)
gettimeofday(&getwork_start, NULL);
- if (api->thread_init && !api->thread_init(mythr)) {
+ if (drv->thread_init && !drv->thread_init(mythr)) {
dev_error(cgpu, REASON_THREAD_FAIL_INIT);
goto out;
}
@@ -5340,7 +5403,7 @@ void *miner_thread(void *userdata)
gettimeofday(&tv_workstart, NULL);
work->blk.nonce = 0;
cgpu->max_hashes = 0;
- if (api->prepare_work && !api->prepare_work(mythr, work)) {
+ if (drv->prepare_work && !drv->prepare_work(mythr, work)) {
applog(LOG_ERR, "work prepare failed, exiting "
"mining thread %d", thr_id);
break;
@@ -5382,16 +5445,16 @@ void *miner_thread(void *userdata)
gettimeofday(&(work->tv_work_start), NULL);
thread_reportin(mythr);
- hashes = api->scanhash(mythr, work, work->blk.nonce + max_nonce);
+ hashes = drv->scanhash(mythr, work, work->blk.nonce + max_nonce);
thread_reportin(mythr);
gettimeofday(&getwork_start, NULL);
if (unlikely(hashes == -1)) {
- applog(LOG_ERR, "%s %d failure, disabling!", api->name, cgpu->device_id);
+ applog(LOG_ERR, "%s %d failure, disabling!", drv->name, cgpu->device_id);
cgpu->deven = DEV_DISABLED;
dev_error(cgpu, REASON_THREAD_ZERO_HASH);
- mt_disable(mythr, thr_id, api);
+ mt_disable(mythr, thr_id, drv);
}
hashes_done += hashes;
@@ -5412,7 +5475,7 @@ void *miner_thread(void *userdata)
if (unlikely((long)sdiff.tv_sec < cycle)) {
int mult;
- if (likely(!api->can_limit_work || max_nonce == 0xffffffff))
+ if (likely(!drv->can_limit_work || max_nonce == 0xffffffff))
continue;
mult = 1000000 / ((sdiff.tv_usec + 0x400) / 0x400) + 0x10;
@@ -5421,9 +5484,9 @@ void *miner_thread(void *userdata)
max_nonce = 0xffffffff;
else
max_nonce = (max_nonce * mult) / 0x400;
- } else if (unlikely(sdiff.tv_sec > cycle) && api->can_limit_work)
+ } else if (unlikely(sdiff.tv_sec > cycle) && drv->can_limit_work)
max_nonce = max_nonce * cycle / sdiff.tv_sec;
- else if (unlikely(sdiff.tv_usec > 100000) && api->can_limit_work)
+ else if (unlikely(sdiff.tv_usec > 100000) && drv->can_limit_work)
max_nonce = max_nonce * 0x400 / (((cycle * 1000000) + sdiff.tv_usec) / (cycle * 1000000 / 0x400));
timersub(&tv_end, &tv_lastupdate, &diff);
@@ -5449,7 +5512,7 @@ void *miner_thread(void *userdata)
}
if (unlikely(mythr->pause || cgpu->deven != DEV_ENABLED))
- mt_disable(mythr, thr_id, api);
+ mt_disable(mythr, thr_id, drv);
sdiff.tv_sec = sdiff.tv_usec = 0;
} while (!abandon_work(work, &wdiff, cgpu->max_hashes));
@@ -5457,8 +5520,8 @@ void *miner_thread(void *userdata)
}
out:
- if (api->thread_shutdown)
- api->thread_shutdown(mythr);
+ if (drv->thread_shutdown)
+ drv->thread_shutdown(mythr);
thread_reportin(mythr);
applog(LOG_ERR, "Thread %d failure, exiting", thr_id);
@@ -5686,8 +5749,8 @@ out:
void reinit_device(struct cgpu_info *cgpu)
{
- if (cgpu->api->reinit_device)
- cgpu->api->reinit_device(cgpu);
+ if (cgpu->drv->reinit_device)
+ cgpu->drv->reinit_device(cgpu);
}
static struct timeval rotate_tv;
@@ -5829,12 +5892,10 @@ static void *watchdog_thread(void __maybe_unused *userdata)
applog(LOG_WARNING, "Will restart execution as scheduled at %02d:%02d",
schedstart.tm.tm_hour, schedstart.tm.tm_min);
sched_paused = true;
- for (i = 0; i < mining_threads; i++) {
- struct thr_info *thr;
- thr = &thr_info[i];
-
- thr->pause = true;
- }
+ mutex_lock(&mining_thr_lock);
+ for (i = 0; i < mining_threads; i++)
+ mining_thr[i]->pause = true;
+ mutex_unlock(&mining_thr_lock);
} else if (sched_paused && should_run()) {
applog(LOG_WARNING, "Restarting execution as per start time %02d:%02d scheduled",
schedstart.tm.tm_hour, schedstart.tm.tm_min);
@@ -5845,7 +5906,10 @@ static void *watchdog_thread(void __maybe_unused *userdata)
for (i = 0; i < mining_threads; i++) {
struct thr_info *thr;
- thr = &thr_info[i];
+
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
/* Don't touch disabled devices */
if (thr->cgpu->deven == DEV_DISABLED)
@@ -5862,12 +5926,12 @@ static void *watchdog_thread(void __maybe_unused *userdata)
char dev_str[8];
int gpu;
- if (cgpu->api->get_stats)
- cgpu->api->get_stats(cgpu);
+ if (cgpu->drv->get_stats)
+ cgpu->drv->get_stats(cgpu);
gpu = cgpu->device_id;
denable = &cgpu->deven;
- sprintf(dev_str, "%s%d", cgpu->api->name, gpu);
+ sprintf(dev_str, "%s%d", cgpu->drv->name, gpu);
#ifdef HAVE_ADL
if (adl_active && cgpu->has_adl)
@@ -5887,7 +5951,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
continue;
#ifdef WANT_CPUMINE
- if (!strcmp(cgpu->api->dname, "cpu"))
+ if (cgpu->drv->drv == DRIVER_CPU)
continue;
#endif
if (cgpu->status != LIFE_WELL && (now.tv_sec - thr->last.tv_sec < WATCHDOG_SICK_TIME)) {
@@ -5944,7 +6008,7 @@ static void log_print_status(struct cgpu_info *cgpu)
applog(LOG_WARNING, "%s", logline);
}
-static void print_summary(void)
+void print_summary(void)
{
struct timeval diff;
int hours, mins, secs, i;
@@ -6277,26 +6341,27 @@ void enable_curses(void) {
/* TODO: fix need a dummy CPU device_api even if no support for CPU mining */
#ifndef WANT_CPUMINE
-struct device_api cpu_api;
-struct device_api cpu_api = {
+struct device_drv cpu_drv;
+struct device_drv cpu_drv = {
+ .drv = DRIVER_CPU,
.name = "CPU",
};
#endif
#ifdef USE_BITFORCE
-extern struct device_api bitforce_api;
+extern struct device_drv bitforce_drv;
#endif
#ifdef USE_ICARUS
-extern struct device_api icarus_api;
+extern struct device_drv icarus_drv;
#endif
#ifdef USE_MODMINER
-extern struct device_api modminer_api;
+extern struct device_drv modminer_drv;
#endif
#ifdef USE_ZTEX
-extern struct device_api ztex_api;
+extern struct device_drv ztex_drv;
#endif
@@ -6311,7 +6376,7 @@ void enable_device(struct cgpu_info *cgpu)
adj_width(mining_threads, &dev_width);
#endif
#ifdef HAVE_OPENCL
- if (cgpu->api == &opencl_api) {
+ if (cgpu->drv->drv == DRIVER_OPENCL) {
gpu_threads += cgpu->threads;
}
#endif
@@ -6328,12 +6393,12 @@ bool add_cgpu(struct cgpu_info*cgpu)
static struct _cgpu_devid_counter *devids = NULL;
struct _cgpu_devid_counter *d;
- HASH_FIND_STR(devids, cgpu->api->name, d);
+ HASH_FIND_STR(devids, cgpu->drv->name, d);
if (d)
cgpu->device_id = ++d->lastid;
else {
d = malloc(sizeof(*d));
- memcpy(d->name, cgpu->api->name, sizeof(d->name));
+ memcpy(d->name, cgpu->drv->name, sizeof(d->name));
cgpu->device_id = d->lastid = 0;
HASH_ADD_STR(devids, name, d);
}
@@ -6342,6 +6407,21 @@ bool add_cgpu(struct cgpu_info*cgpu)
return true;
}
+struct device_drv *copy_drv(struct device_drv *drv)
+{
+ struct device_drv *copy;
+ char buf[100];
+
+ if (unlikely(!(copy = malloc(sizeof(*copy))))) {
+ sprintf(buf, "Failed to allocate device_drv copy of %s (%s)",
+ drv->name, drv->copy ? "copy" : "original");
+ quit(1, buf);
+ }
+ memcpy(copy, drv, sizeof(*copy));
+ copy->copy = true;
+ return copy;
+}
+
int main(int argc, char *argv[])
{
bool pools_active = false;
@@ -6382,6 +6462,7 @@ int main(int argc, char *argv[])
mutex_init(&sshare_lock);
rwlock_init(&blk_lock);
rwlock_init(&netacc_lock);
+ mutex_init(&mining_thr_lock);
mutex_init(&lp_lock);
if (unlikely(pthread_cond_init(&lp_cond, NULL)))
@@ -6551,32 +6632,32 @@ int main(int argc, char *argv[])
#ifdef HAVE_OPENCL
if (!opt_nogpu)
- opencl_api.api_detect();
+ opencl_drv.drv_detect();
gpu_threads = 0;
#endif
#ifdef USE_ICARUS
if (!opt_scrypt)
- icarus_api.api_detect();
+ icarus_drv.drv_detect();
#endif
#ifdef USE_BITFORCE
if (!opt_scrypt)
- bitforce_api.api_detect();
+ bitforce_drv.drv_detect();
#endif
#ifdef USE_MODMINER
if (!opt_scrypt)
- modminer_api.api_detect();
+ modminer_drv.drv_detect();
#endif
#ifdef USE_ZTEX
if (!opt_scrypt)
- ztex_api.api_detect();
+ ztex_drv.drv_detect();
#endif
#ifdef WANT_CPUMINE
- cpu_api.api_detect();
+ cpu_drv.drv_detect();
#endif
if (devices_enabled == -1) {
@@ -6584,9 +6665,9 @@ int main(int argc, char *argv[])
for (i = 0; i < total_devices; ++i) {
struct cgpu_info *cgpu = devices[i];
if (cgpu->name)
- applog(LOG_ERR, " %2d. %s %d: %s (driver: %s)", i, cgpu->api->name, cgpu->device_id, cgpu->name, cgpu->api->dname);
+ applog(LOG_ERR, " %2d. %s %d: %s (driver: %s)", i, cgpu->drv->name, cgpu->device_id, cgpu->name, cgpu->drv->dname);
else
- applog(LOG_ERR, " %2d. %s %d (driver: %s)", i, cgpu->api->name, cgpu->device_id, cgpu->api->dname);
+ applog(LOG_ERR, " %2d. %s %d (driver: %s)", i, cgpu->drv->name, cgpu->device_id, cgpu->drv->dname);
}
quit(0, "%d devices listed", total_devices);
}
@@ -6600,7 +6681,7 @@ int main(int argc, char *argv[])
enable_device(devices[i]);
} else if (i < total_devices) {
if (opt_removedisabled) {
- if (devices[i]->api == &cpu_api)
+ if (devices[i]->drv->drv == DRIVER_CPU)
--opt_n_threads;
} else {
enable_device(devices[i]);
@@ -6666,14 +6747,23 @@ int main(int argc, char *argv[])
fork_monitor();
#endif // defined(unix)
- total_threads = mining_threads + 7;
- thr_info = calloc(total_threads, sizeof(*thr));
- if (!thr_info)
- quit(1, "Failed to calloc thr_info");
+ mining_thr = calloc(mining_threads, sizeof(thr));
+ if (!mining_thr)
+ quit(1, "Failed to calloc mining_thr");
+ for (i = 0; i < mining_threads; i++) {
+ mining_thr[i] = calloc(1, sizeof(*thr));
+ if (!mining_thr[i])
+ quit(1, "Failed to calloc mining_thr[%d]", i);
+ }
- gwsched_thr_id = mining_threads;
- stage_thr_id = mining_threads + 1;
- thr = &thr_info[stage_thr_id];
+ total_control_threads = 7;
+ control_thr = calloc(total_control_threads, sizeof(*thr));
+ if (!control_thr)
+ quit(1, "Failed to calloc control_thr");
+
+ gwsched_thr_id = 0;
+ stage_thr_id = 1;
+ thr = &control_thr[stage_thr_id];
thr->q = tq_new();
if (!thr->q)
quit(1, "Failed to tq_new");
@@ -6765,14 +6855,16 @@ begin_bench:
cgpu->status = LIFE_INIT;
for (j = 0; j < cgpu->threads; ++j, ++k) {
- thr = &thr_info[k];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[k];
+ mutex_unlock(&mining_thr_lock);
thr->id = k;
thr->cgpu = cgpu;
thr->device_thread = j;
thr->q = tq_new();
if (!thr->q)
- quit(1, "tq_new failed in starting %s%d mining thread (#%d)", cgpu->api->name, cgpu->device_id, i);
+ quit(1, "tq_new failed in starting %s%d mining thread (#%d)", cgpu->drv->name, cgpu->device_id, i);
/* Enable threads for devices set not to mine but disable
* their queue in case we wish to enable them later */
@@ -6782,7 +6874,7 @@ begin_bench:
tq_push(thr->q, &ping);
}
- if (cgpu->api->thread_prepare && !cgpu->api->thread_prepare(thr))
+ if (cgpu->drv->thread_prepare && !cgpu->drv->thread_prepare(thr))
continue;
thread_reportout(thr);
@@ -6810,15 +6902,15 @@ begin_bench:
gettimeofday(&total_tv_start, NULL);
gettimeofday(&total_tv_end, NULL);
- watchpool_thr_id = mining_threads + 2;
- thr = &thr_info[watchpool_thr_id];
+ watchpool_thr_id = 2;
+ thr = &control_thr[watchpool_thr_id];
/* start watchpool thread */
if (thr_info_create(thr, NULL, watchpool_thread, NULL))
quit(1, "watchpool thread create failed");
pthread_detach(thr->pth);
- watchdog_thr_id = mining_threads + 3;
- thr = &thr_info[watchdog_thr_id];
+ watchdog_thr_id = 3;
+ thr = &control_thr[watchdog_thr_id];
/* start watchdog thread */
if (thr_info_create(thr, NULL, watchdog_thread, NULL))
quit(1, "watchdog thread create failed");
@@ -6826,8 +6918,8 @@ begin_bench:
#ifdef HAVE_OPENCL
/* Create reinit gpu thread */
- gpur_thr_id = mining_threads + 4;
- thr = &thr_info[gpur_thr_id];
+ gpur_thr_id = 4;
+ thr = &control_thr[gpur_thr_id];
thr->q = tq_new();
if (!thr->q)
quit(1, "tq_new failed for gpur_thr_id");
@@ -6836,8 +6928,8 @@ begin_bench:
#endif
/* Create API socket thread */
- api_thr_id = mining_threads + 5;
- thr = &thr_info[api_thr_id];
+ api_thr_id = 5;
+ thr = &control_thr[api_thr_id];
if (thr_info_create(thr, NULL, api_thread, thr))
quit(1, "API thread create failed");
@@ -6845,13 +6937,17 @@ begin_bench:
/* Create curses input thread for keyboard input. Create this last so
* that we know all threads are created since this can call kill_work
* to try and shut down ll previous threads. */
- input_thr_id = mining_threads + 6;
- thr = &thr_info[input_thr_id];
+ input_thr_id = 6;
+ thr = &control_thr[input_thr_id];
if (thr_info_create(thr, NULL, input_thread, thr))
quit(1, "input thread create failed");
pthread_detach(thr->pth);
#endif
+ /* Just to be sure */
+ if (total_control_threads != 7)
+ quit(1, "incorrect total_control_threads (%d) should be 7", total_control_threads);
+
/* Once everything is set up, main() becomes the getwork scheduler */
while (42) {
int ts, max_staged = opt_queue;
diff --git a/configure.ac b/configure.ac
index c022603..72b8f14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,6 +273,7 @@ fi
AM_CONDITIONAL([NEED_FPGAUTILS], [test x$icarus$bitforce$modminer$ztex != xnononono])
+AM_CONDITIONAL([NEED_USBUTILS_C], [test x$bitforce$modminer != xnono])
AM_CONDITIONAL([HAVE_CURSES], [test x$curses = xyes])
AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
@@ -321,7 +322,7 @@ fi
AM_CONDITIONAL([HAS_YASM], [test x$has_yasm = xtrue])
-if test "x$bitforce" != xno; then
+if test "x$icarus" != xno; then
AC_ARG_WITH([libudev], [AC_HELP_STRING([--without-libudev], [Autodetect FPGAs using libudev (default enabled)])],
[libudev=$withval],
[libudev=auto]
@@ -343,7 +344,7 @@ AM_CONDITIONAL([HAVE_LIBUDEV], [test x$libudev != xno])
PKG_PROG_PKG_CONFIG()
-if test "x$ztex$modminer" != xnono; then
+if test "x$ztex$modminer$bitforce" != xnonono; then
case $target in
*-*-freebsd*)
LIBUSB_LIBS="-lusb"
@@ -508,7 +509,7 @@ else
echo " Ztex.FPGAs...........: Disabled"
fi
-if test "x$bitforce" != xno; then
+if test "x$icarus" != xno; then
echo " libudev.detection....: $libudev"
fi
diff --git a/driver-bitforce.c b/driver-bitforce.c
index b8a8343..69da9a5 100644
--- a/driver-bitforce.c
+++ b/driver-bitforce.c
@@ -1,4 +1,5 @@
/*
+ * Copyright 2012-2013 Andrew Smith
* Copyright 2012 Luke Dashjr
* Copyright 2012 Con Kolivas
*
@@ -19,34 +20,35 @@
#include "config.h"
#ifdef WIN32
-
#include <windows.h>
-
-#define dlsym (void*)GetProcAddress
-#define dlclose FreeLibrary
-
-typedef unsigned long FT_STATUS;
-typedef PVOID FT_HANDLE;
-__stdcall FT_STATUS (*FT_ListDevices)(PVOID pArg1, PVOID pArg2, DWORD Flags);
-__stdcall FT_STATUS (*FT_Open)(int idx, FT_HANDLE*);
-__stdcall FT_STATUS (*FT_GetComPortNumber)(FT_HANDLE, LPLONG lplComPortNumber);
-__stdcall FT_STATUS (*FT_Close)(FT_HANDLE);
-const uint32_t FT_OPEN_BY_DESCRIPTION = 2;
-const uint32_t FT_LIST_ALL = 0x20000000;
-const uint32_t FT_LIST_NUMBER_ONLY = 0x80000000;
-enum {
- FT_OK,
-};
-
-// Code must deal with a timeout. Make it 1 second on windows, 0.1 on linux.
-#define BFopen(devpath) serial_open(devpath, 0, 10, true)
-#else /* WIN32 */
-#define BFopen(devpath) serial_open(devpath, 0, 1, true)
#endif /* WIN32 */
#include "compat.h"
#include "miner.h"
-#include "fpgautils.h"
+#include "usbutils.h"
+
+#define BITFORCE_IDENTIFY "ZGX"
+#define BITFORCE_IDENTIFY_LEN (sizeof(BITFORCE_IDENTIFY)-1)
+#define BITFORCE_FLASH "ZMX"
+#define BITFORCE_FLASH_LEN (sizeof(BITFORCE_FLASH)-1)
+#define BITFORCE_TEMPERATURE "ZLX"
+#define BITFORCE_TEMPERATURE_LEN (sizeof(BITFORCE_TEMPERATURE)-1)
+#define BITFORCE_SENDRANGE "ZPX"
+#define BITFORCE_SENDRANGE_LEN (sizeof(BITFORCE_SENDRANGE)-1)
+#define BITFORCE_SENDWORK "ZDX"
+#define BITFORCE_SENDWORK_LEN (sizeof(BITFORCE_SENDWORK)-1)
+#define BITFORCE_WORKSTATUS "ZFX"
+#define BITFORCE_WORKSTATUS_LEN (sizeof(BITFORCE_WORKSTATUS)-1)
+
+// Either of Nonce or No-nonce start with:
+#define BITFORCE_EITHER "N"
+#define BITFORCE_EITHER_LEN 1
+#define BITFORCE_NONCE "NONCE-FOUND"
+#define BITFORCE_NONCE_LEN (sizeof(BITFORCE_NONCE)-1)
+#define BITFORCE_NO_NONCE "NO-NONCE"
+#define BITFORCE_NO_NONCE_MATCH 3
+#define BITFORCE_IDLE "IDLE"
+#define BITFORCE_IDLE_MATCH 1
#define BITFORCE_SLEEP_MS 500
#define BITFORCE_TIMEOUT_S 7
@@ -62,62 +64,197 @@ enum {
#define KNAME_WORK "full work"
#define KNAME_RANGE "nonce range"
-struct device_api bitforce_api;
+#define BITFORCE_BUFSIZ (0x200)
-static void BFgets(char *buf, size_t bufLen, int fd)
-{
- do {
- buf[0] = '\0';
- --bufLen;
- } while (likely(bufLen && read(fd, buf, 1) == 1 && (buf++)[0] != '\n'));
+// If initialisation fails the first time,
+// sleep this amount (ms) and try again
+#define REINIT_TIME_FIRST_MS 100
+// Max ms per sleep
+#define REINIT_TIME_MAX_MS 800
+// Keep trying up to this many us
+#define REINIT_TIME_MAX 3000000
- buf[0] = '\0';
-}
+static const char *blank = "";
+
+struct device_drv bitforce_drv;
-static ssize_t BFwrite(int fd, const void *buf, ssize_t bufLen)
+static void bitforce_initialise(struct cgpu_info *bitforce, bool lock)
{
- if ((bufLen) != write(fd, buf, bufLen))
- return 0;
- else
- return bufLen;
-}
+ int err;
-#define BFclose(fd) close(fd)
+ if (lock)
+ mutex_lock(&bitforce->device_mutex);
-static bool bitforce_detect_one(const char *devpath)
+ // Reset
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_RESET,
+ FTDI_VALUE_RESET, bitforce->usbdev->found->interface, C_RESET);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: reset got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+ if (bitforce->usbinfo.nodev)
+ goto failed;
+
+ // Set data control
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_DATA,
+ FTDI_VALUE_DATA, bitforce->usbdev->found->interface, C_SETDATA);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: setdata got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+ if (bitforce->usbinfo.nodev)
+ goto failed;
+
+ // Set the baud
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_BAUD, FTDI_VALUE_BAUD,
+ (FTDI_INDEX_BAUD & 0xff00) | bitforce->usbdev->found->interface,
+ C_SETBAUD);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: setbaud got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+ if (bitforce->usbinfo.nodev)
+ goto failed;
+
+ // Set Flow Control
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_FLOW,
+ FTDI_VALUE_FLOW, bitforce->usbdev->found->interface, C_SETFLOW);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: setflowctrl got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+ if (bitforce->usbinfo.nodev)
+ goto failed;
+
+ // Set Modem Control
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_MODEM,
+ FTDI_VALUE_MODEM, bitforce->usbdev->found->interface, C_SETMODEM);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: setmodemctrl got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+ if (bitforce->usbinfo.nodev)
+ goto failed;
+
+ // Clear any sent data
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_RESET,
+ FTDI_VALUE_PURGE_TX, bitforce->usbdev->found->interface, C_PURGETX);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: purgetx got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+ if (bitforce->usbinfo.nodev)
+ goto failed;
+
+ // Clear any received data
+ err = usb_transfer(bitforce, FTDI_TYPE_OUT, FTDI_REQUEST_RESET,
+ FTDI_VALUE_PURGE_RX, bitforce->usbdev->found->interface, C_PURGERX);
+ if (opt_debug)
+ applog(LOG_DEBUG, "%s%i: purgerx got err %d",
+ bitforce->drv->name, bitforce->device_id, err);
+
+failed:
+
+ if (lock)
+ mutex_unlock(&bitforce->device_mutex);
+}
+
+static bool bitforce_detect_one(struct libusb_device *dev, struct usb_find_devices *found)
{
- int fdDev = BFopen(devpath);
- struct cgpu_info *bitforce;
- char pdevbuf[0x100];
+ char buf[BITFORCE_BUFSIZ+1];
+ char devpath[20];
+ int err, amount;
char *s;
+ struct timeval init_start, init_now;
+ int init_sleep, init_count;
+ bool ident_first;
- applog(LOG_DEBUG, "BFL: Attempting to open %s", devpath);
+ struct cgpu_info *bitforce = NULL;
+ bitforce = calloc(1, sizeof(*bitforce));
+ bitforce->drv = &bitforce_drv;
+ bitforce->deven = DEV_ENABLED;
+ bitforce->threads = 1;
- if (unlikely(fdDev == -1)) {
- applog(LOG_ERR, "BFL: Failed to open %s", devpath);
- return false;
+ if (!usb_init(bitforce, dev, found)) {
+ applog(LOG_ERR, "%s detect (%d:%d) failed to initialise (incorrect device?)",
+ bitforce->drv->dname,
+ (int)(bitforce->usbinfo.bus_number),
+ (int)(bitforce->usbinfo.device_address));
+ goto shin;
}
- BFwrite(fdDev, "ZGX", 3);
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
- if (unlikely(!pdevbuf[0])) {
- applog(LOG_ERR, "BFL: Error reading/timeout (ZGX)");
- return 0;
+ sprintf(devpath, "%d:%d",
+ (int)(bitforce->usbinfo.bus_number),
+ (int)(bitforce->usbinfo.device_address));
+
+
+ // Allow 2 complete attempts if the 1st time returns an unrecognised reply
+ ident_first = true;
+retry:
+ init_count = 0;
+ init_sleep = REINIT_TIME_FIRST_MS;
+ gettimeofday(&init_start, NULL);
+reinit:
+ bitforce_initialise(bitforce, false);
+ if ((err = usb_write(bitforce, BITFORCE_IDENTIFY, BITFORCE_IDENTIFY_LEN, &amount, C_REQUESTIDENTIFY)) < 0 || amount != BITFORCE_IDENTIFY_LEN) {
+ applog(LOG_ERR, "%s detect (%s) send identify request failed (%d:%d)",
+ bitforce->drv->dname, devpath, amount, err);
+ goto unshin;
}
- BFclose(fdDev);
- if (unlikely(!strstr(pdevbuf, "SHA256"))) {
- applog(LOG_ERR, "BFL: Didn't recognise BitForce on %s", devpath);
- return false;
+ if ((err = usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_GETIDENTIFY)) < 0 || amount < 1) {
+ init_count++;
+ gettimeofday(&init_now, NULL);
+ if (us_tdiff(&init_now, &init_start) <= REINIT_TIME_MAX) {
+ if (init_count == 2) {
+ applog(LOG_WARNING, "%s detect (%s) 2nd init failed (%d:%d) - retrying",
+ bitforce->drv->dname, devpath, amount, err);
+ }
+ nmsleep(init_sleep);
+ if ((init_sleep * 2) <= REINIT_TIME_MAX_MS)
+ init_sleep *= 2;
+ goto reinit;
+ }
+
+ if (init_count > 0)
+ applog(LOG_WARNING, "%s detect (%s) init failed %d times %.2fs",
+ bitforce->drv->dname, devpath, init_count, tdiff(&init_now, &init_start));
+
+ if (err < 0) {
+ applog(LOG_ERR, "%s detect (%s) error identify reply (%d:%d)",
+ bitforce->drv->dname, devpath, amount, err);
+ } else {
+ applog(LOG_ERR, "%s detect (%s) empty identify reply (%d)",
+ bitforce->drv->dname, devpath, amount);
+ }
+
+ goto unshin;
+ }
+ buf[amount] = '\0';
+
+ if (unlikely(!strstr(buf, "SHA256"))) {
+ if (ident_first) {
+ applog(LOG_WARNING, "%s detect (%s) didn't recognise '%s' trying again ...",
+ bitforce->drv->dname, devpath, buf);
+ ident_first = false;
+ goto retry;
+ }
+ applog(LOG_ERR, "%s detect (%s) didn't recognise '%s' on 2nd attempt",
+ bitforce->drv->dname, devpath, buf);
+ goto unshin;
+ }
+
+ if (likely((!memcmp(buf, ">>>ID: ", 7)) && (s = strstr(buf + 3, ">>>")))) {
+ s[0] = '\0';
+ bitforce->name = strdup(buf + 7);
+ } else {
+ bitforce->name = (char *)blank;
}
// We have a real BitForce!
- bitforce = calloc(1, sizeof(*bitforce));
- bitforce->api = &bitforce_api;
- bitforce->device_path = strdup(devpath);
- bitforce->deven = DEV_ENABLED;
- bitforce->threads = 1;
+ applog(LOG_DEBUG, "%s (%s) identified as: '%s'",
+ bitforce->drv->dname, devpath, bitforce->name);
+
/* Initially enable support for nonce range and disable it later if it
* fails */
if (opt_bfl_noncerange) {
@@ -129,108 +266,39 @@ static bool bitforce_detect_one(const char *devpath)
bitforce->kname = KNAME_WORK;
}
- if (likely((!memcmp(pdevbuf, ">>>ID: ", 7)) && (s = strstr(pdevbuf + 3, ">>>")))) {
- s[0] = '\0';
- bitforce->name = strdup(pdevbuf + 7);
- }
+ bitforce->device_path = strdup(devpath);
+
+ if (!add_cgpu(bitforce))
+ goto unshin;
+
+ update_usb_stats(bitforce);
mutex_init(&bitforce->device_mutex);
- return add_cgpu(bitforce);
-}
+ return true;
-#define LOAD_SYM(sym) do { \
- if (!(sym = dlsym(dll, #sym))) { \
- applog(LOG_DEBUG, "Failed to load " #sym ", not using FTDI bitforce autodetect"); \
- goto out; \
- } \
-} while(0)
+unshin:
-#ifdef WIN32
-static int bitforce_autodetect_ftdi(void)
-{
- char devpath[] = "\\\\.\\COMnnnnn";
- char *devpathnum = &devpath[7];
- char **bufptrs;
- char *buf;
- int found = 0;
- DWORD i;
-
- FT_STATUS ftStatus;
- DWORD numDevs;
- HMODULE dll = LoadLibrary("FTD2XX.DLL");
- if (!dll) {
- applog(LOG_DEBUG, "FTD2XX.DLL failed to load, not using FTDI bitforce autodetect");
- return 0;
- }
- LOAD_SYM(FT_ListDevices);
- LOAD_SYM(FT_Open);
- LOAD_SYM(FT_GetComPortNumber);
- LOAD_SYM(FT_Close);
-
- ftStatus = FT_ListDevices(&numDevs, NULL, FT_LIST_NUMBER_ONLY);
- if (ftStatus != FT_OK) {
- applog(LOG_DEBUG, "FTDI device count failed, not using FTDI bitforce autodetect");
- goto out;
- }
- applog(LOG_DEBUG, "FTDI reports %u devices", (unsigned)numDevs);
-
- buf = alloca(65 * numDevs);
- bufptrs = alloca(sizeof(*bufptrs) * (numDevs + 1));
-
- for (i = 0; i < numDevs; ++i)
- bufptrs[i] = &buf[i * 65];
- bufptrs[numDevs] = NULL;
- ftStatus = FT_ListDevices(bufptrs, &numDevs, FT_LIST_ALL | FT_OPEN_BY_DESCRIPTION);
- if (ftStatus != FT_OK) {
- applog(LOG_DEBUG, "FTDI device list failed, not using FTDI bitforce autodetect");
- goto out;
- }
-
- for (i = numDevs; i > 0; ) {
- --i;
- bufptrs[i][64] = '\0';
-
- if (!(strstr(bufptrs[i], "BitFORCE") && strstr(bufptrs[i], "SHA256")))
- continue;
-
- FT_HANDLE ftHandle;
- if (FT_OK != FT_Open(i, &ftHandle))
- continue;
- LONG lComPortNumber;
- ftStatus = FT_GetComPortNumber(ftHandle, &lComPortNumber);
- FT_Close(ftHandle);
- if (FT_OK != ftStatus || lComPortNumber < 0)
- continue;
-
- sprintf(devpathnum, "%d", (int)lComPortNumber);
-
- if (bitforce_detect_one(devpath))
- ++found;
- }
+ usb_uninit(bitforce);
-out:
- dlclose(dll);
- return found;
-}
-#else
-static int bitforce_autodetect_ftdi(void)
-{
- return 0;
-}
-#endif
+shin:
-static int bitforce_detect_auto(void)
-{
- return (serial_autodetect_udev (bitforce_detect_one, "BitFORCE*SHA256") ?:
- serial_autodetect_devserial(bitforce_detect_one, "BitFORCE_SHA256") ?:
- bitforce_autodetect_ftdi() ?:
- 0);
+ free(bitforce->device_path);
+
+ if (bitforce->name != blank)
+ free(bitforce->name);
+
+ if (bitforce->drv->copy)
+ free(bitforce->drv);
+
+ free(bitforce);
+
+ return false;
}
static void bitforce_detect(void)
{
- serial_detect_auto(&bitforce_api, bitforce_detect_one, bitforce_detect_auto);
+ usb_detect(&bitforce_drv, bitforce_detect_one);
}
static void get_bitforce_statline_before(char *buf, struct cgpu_info *bitforce)
@@ -247,105 +315,17 @@ static void get_bitforce_statline_before(char *buf, struct cgpu_info *bitforce)
static bool bitforce_thread_prepare(struct thr_info *thr)
{
struct cgpu_info *bitforce = thr->cgpu;
- int fdDev = BFopen(bitforce->device_path);
struct timeval now;
- if (unlikely(fdDev == -1)) {
- applog(LOG_ERR, "BFL%i: Failed to open %s", bitforce->device_id, bitforce->device_path);
- return false;
- }
-
- bitforce->device_fd = fdDev;
-
- applog(LOG_INFO, "BFL%i: Opened %s", bitforce->device_id, bitforce->device_path);
gettimeofday(&now, NULL);
get_datestamp(bitforce->init, &now);
return true;
}
-static void bitforce_clear_buffer(struct cgpu_info *bitforce)
-{
- int fdDev = bitforce->device_fd;
- char pdevbuf[0x100];
- int count = 0;
-
- if (!fdDev)
- return;
-
- applog(LOG_DEBUG, "BFL%i: Clearing read buffer", bitforce->device_id);
-
- mutex_lock(&bitforce->device_mutex);
- do {
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
- } while (pdevbuf[0] && (++count < 10));
- mutex_unlock(&bitforce->device_mutex);
-}
-
-void bitforce_init(struct cgpu_info *bitforce)
-{
- char *devpath = bitforce->device_path;
- int fdDev = bitforce->device_fd, retries = 0;
- char pdevbuf[0x100];
- char *s;
-
- applog(LOG_WARNING, "BFL%i: Re-initialising", bitforce->device_id);
-
- bitforce_clear_buffer(bitforce);
-
- mutex_lock(&bitforce->device_mutex);
- if (fdDev) {
- BFclose(fdDev);
- sleep(5);
- }
- bitforce->device_fd = 0;
-
- fdDev = BFopen(devpath);
- if (unlikely(fdDev == -1)) {
- mutex_unlock(&bitforce->device_mutex);
- applog(LOG_ERR, "BFL%i: Failed to open %s", bitforce->device_id, devpath);
- return;
- }
-
- do {
- BFwrite(fdDev, "ZGX", 3);
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
-
- if (unlikely(!pdevbuf[0])) {
- mutex_unlock(&bitforce->device_mutex);
- applog(LOG_ERR, "BFL%i: Error reading/timeout (ZGX)", bitforce->device_id);
- return;
- }
-
- if (retries++)
- nmsleep(10);
- } while (!strstr(pdevbuf, "BUSY") && (retries * 10 < BITFORCE_TIMEOUT_MS));
-
- if (unlikely(!strstr(pdevbuf, "SHA256"))) {
- mutex_unlock(&bitforce->device_mutex);
- applog(LOG_ERR, "BFL%i: Didn't recognise BitForce on %s returned: %s", bitforce->device_id, devpath, pdevbuf);
- return;
- }
-
- if (likely((!memcmp(pdevbuf, ">>>ID: ", 7)) && (s = strstr(pdevbuf + 3, ">>>")))) {
- s[0] = '\0';
- bitforce->name = strdup(pdevbuf + 7);
- }
-
- bitforce->device_fd = fdDev;
- bitforce->sleep_ms = BITFORCE_SLEEP_MS;
-
- mutex_unlock(&bitforce->device_mutex);
-}
-
static void bitforce_flash_led(struct cgpu_info *bitforce)
{
- int fdDev = bitforce->device_fd;
-
- if (!fdDev)
- return;
+ int err, amount;
/* Do not try to flash the led if we're polling for a result to
* minimise the chance of interleaved results */
@@ -353,19 +333,22 @@ static void bitforce_flash_led(struct cgpu_info *bitforce)
return;
/* It is not critical flashing the led so don't get stuck if we
- * can't grab the mutex here */
+ * can't grab the mutex now */
if (mutex_trylock(&bitforce->device_mutex))
return;
- BFwrite(fdDev, "ZMX", 3);
+ if ((err = usb_write(bitforce, BITFORCE_FLASH, BITFORCE_FLASH_LEN, &amount, C_REQUESTFLASH)) < 0 || amount != BITFORCE_FLASH_LEN) {
+ applog(LOG_ERR, "%s%i: flash request failed (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ } else {
+ /* However, this stops anything else getting a reply
+ * So best to delay any other access to the BFL */
+ sleep(4);
+ }
/* Once we've tried - don't do it until told to again */
bitforce->flash_led = false;
- /* However, this stops anything else getting a reply
- * So best to delay any other access to the BFL */
- sleep(4);
-
mutex_unlock(&bitforce->device_mutex);
return; // nothing is returned by the BFL
@@ -373,11 +356,12 @@ static void bitforce_flash_led(struct cgpu_info *bitforce)
static bool bitforce_get_temp(struct cgpu_info *bitforce)
{
- int fdDev = bitforce->device_fd;
- char pdevbuf[0x100];
+ char buf[BITFORCE_BUFSIZ+1];
+ int err, amount;
char *s;
- if (!fdDev)
+ // Device is gone
+ if (bitforce->usbinfo.nodev)
return false;
/* Do not try to get the temperature if we're polling for a result to
@@ -396,18 +380,30 @@ static bool bitforce_get_temp(struct cgpu_info *bitforce)
if (mutex_trylock(&bitforce->device_mutex))
return false;
- BFwrite(fdDev, "ZLX", 3);
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
- mutex_unlock(&bitforce->device_mutex);
-
- if (unlikely(!pdevbuf[0])) {
- applog(LOG_ERR, "BFL%i: Error: Get temp returned empty string/timed out", bitforce->device_id);
+ if ((err = usb_write(bitforce, BITFORCE_TEMPERATURE, BITFORCE_TEMPERATURE_LEN, &amount, C_REQUESTTEMPERATURE)) < 0 || amount != BITFORCE_TEMPERATURE_LEN) {
+ mutex_unlock(&bitforce->device_mutex);
+ applog(LOG_ERR, "%s%i: Error: Request temp invalid/timed out (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
bitforce->hw_errors++;
return false;
}
- if ((!strncasecmp(pdevbuf, "TEMP", 4)) && (s = strchr(pdevbuf + 4, ':'))) {
+ if ((err = usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_GETTEMPERATURE)) < 0 || amount < 1) {
+ mutex_unlock(&bitforce->device_mutex);
+ if (err < 0) {
+ applog(LOG_ERR, "%s%i: Error: Get temp return invalid/timed out (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ } else {
+ applog(LOG_ERR, "%s%i: Error: Get temp returned nothing (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ }
+ bitforce->hw_errors++;
+ return false;
+ }
+
+ mutex_unlock(&bitforce->device_mutex);
+
+ if ((!strncasecmp(buf, "TEMP", 4)) && (s = strchr(buf + 4, ':'))) {
float temp = strtof(s + 1, NULL);
/* Cope with older software that breaks and reads nonsense
@@ -418,7 +414,8 @@ static bool bitforce_get_temp(struct cgpu_info *bitforce)
if (temp > 0) {
bitforce->temp = temp;
if (unlikely(bitforce->cutofftemp > 0 && temp > bitforce->cutofftemp)) {
- applog(LOG_WARNING, "BFL%i: Hit thermal cutoff limit, disabling!", bitforce->device_id);
+ applog(LOG_WARNING, "%s%i: Hit thermal cutoff limit, disabling!",
+ bitforce->drv->name, bitforce->device_id);
bitforce->deven = DEV_RECOVER;
dev_error(bitforce, REASON_DEV_THERMAL_CUTOFF);
}
@@ -427,11 +424,12 @@ static bool bitforce_get_temp(struct cgpu_info *bitforce)
/* Use the temperature monitor as a kind of watchdog for when
* our responses are out of sync and flush the buffer to
* hopefully recover */
- applog(LOG_WARNING, "BFL%i: Garbled response probably throttling, clearing buffer", bitforce->device_id);
+ applog(LOG_WARNING, "%s%i: Garbled response probably throttling, clearing buffer",
+ bitforce->drv->name, bitforce->device_id);
dev_error(bitforce, REASON_DEV_THROTTLE);
/* Count throttling episodes as hardware errors */
bitforce->hw_errors++;
- bitforce_clear_buffer(bitforce);
+ bitforce_initialise(bitforce, true);
return false;
}
@@ -441,35 +439,53 @@ static bool bitforce_get_temp(struct cgpu_info *bitforce)
static bool bitforce_send_work(struct thr_info *thr, struct work *work)
{
struct cgpu_info *bitforce = thr->cgpu;
- int fdDev = bitforce->device_fd;
unsigned char ob[70];
- char pdevbuf[0x100];
+ char buf[BITFORCE_BUFSIZ+1];
+ int err, amount;
char *s;
+ char *cmd;
+ int len;
- if (!fdDev)
- return false;
re_send:
+ if (bitforce->nonce_range) {
+ cmd = BITFORCE_SENDRANGE;
+ len = BITFORCE_SENDRANGE_LEN;
+ } else {
+ cmd = BITFORCE_SENDWORK;
+ len = BITFORCE_SENDWORK_LEN;
+ }
+
mutex_lock(&bitforce->device_mutex);
- if (bitforce->nonce_range)
- BFwrite(fdDev, "ZPX", 3);
- else
- BFwrite(fdDev, "ZDX", 3);
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
- if (!pdevbuf[0] || !strncasecmp(pdevbuf, "B", 1)) {
+ if ((err = usb_write(bitforce, cmd, len, &amount, C_REQUESTSENDWORK)) < 0 || amount != len) {
+ mutex_unlock(&bitforce->device_mutex);
+ applog(LOG_ERR, "%s%i: request send work failed (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ return false;
+ }
+
+ if ((err = usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_REQUESTSENDWORKSTATUS)) < 0) {
+ mutex_unlock(&bitforce->device_mutex);
+ applog(LOG_ERR, "%s%d: read request send work status failed (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ return false;
+ }
+
+ if (amount == 0 || !buf[0] || !strncasecmp(buf, "B", 1)) {
mutex_unlock(&bitforce->device_mutex);
nmsleep(WORK_CHECK_INTERVAL_MS);
goto re_send;
- } else if (unlikely(strncasecmp(pdevbuf, "OK", 2))) {
+ } else if (unlikely(strncasecmp(buf, "OK", 2))) {
mutex_unlock(&bitforce->device_mutex);
if (bitforce->nonce_range) {
- applog(LOG_WARNING, "BFL%i: Does not support nonce range, disabling", bitforce->device_id);
+ applog(LOG_WARNING, "%s%i: Does not support nonce range, disabling",
+ bitforce->drv->name, bitforce->device_id);
bitforce->nonce_range = false;
bitforce->sleep_ms *= 5;
bitforce->kname = KNAME_WORK;
goto re_send;
}
- applog(LOG_ERR, "BFL%i: Error: Send work reports: %s", bitforce->device_id, pdevbuf);
+ applog(LOG_ERR, "%s%i: Error: Send work reports: %s",
+ bitforce->drv->name, bitforce->device_id, buf);
return false;
}
@@ -479,7 +495,7 @@ re_send:
if (!bitforce->nonce_range) {
sprintf((char *)ob + 8 + 32 + 12, ">>>>>>>>");
work->blk.nonce = bitforce->nonces = 0xffffffff;
- BFwrite(fdDev, ob, 60);
+ len = 60;
} else {
uint32_t *nonce;
@@ -491,26 +507,41 @@ re_send:
*nonce = htobe32(work->blk.nonce + bitforce->nonces);
work->blk.nonce += bitforce->nonces + 1;
sprintf((char *)ob + 8 + 32 + 12 + 8, ">>>>>>>>");
- BFwrite(fdDev, ob, 68);
+ len = 68;
+ }
+
+ if ((err = usb_write(bitforce, (char *)ob, len, &amount, C_SENDWORK)) < 0 || amount != len) {
+ mutex_unlock(&bitforce->device_mutex);
+ applog(LOG_ERR, "%s%i: send work failed (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ return false;
+ }
+
+ if ((err = usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_SENDWORKSTATUS)) < 0) {
+ mutex_unlock(&bitforce->device_mutex);
+ applog(LOG_ERR, "%s%d: read send work status failed (%d:%d)",
+ bitforce->drv->name, bitforce->device_id, amount, err);
+ return false;
}
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
mutex_unlock(&bitforce->device_mutex);
if (opt_debug) {
s = bin2hex(ob + 8, 44);
- applog(LOG_DEBUG, "BFL%i: block data: %s", bitforce->device_id, s);
+ applog(LOG_DEBUG, "%s%i: block data: %s",
+ bitforce->drv->name, bitforce->device_id, s);
free(s);
}
- if (unlikely(!pdevbuf[0])) {
- applog(LOG_ERR, "BFL%i: Error: Send block data returned empty string/timed out", bitforce->device_id);
+ if (amount == 0 || !buf[0]) {
+ applog(LOG_ERR, "%s%i: Error: Send block data returned empty string/timed out",
+ bitforce->drv->name, bitforce->device_id);
return false;
}
- if (unlikely(strncasecmp(pdevbuf, "OK", 2))) {
- applog(LOG_ERR, "BFL%i: Error: Send block data reports: %s", bitforce->device_id, pdevbuf);
+ if (unlikely(strncasecmp(buf, "OK", 2))) {
+ applog(LOG_ERR, "%s%i: Error: Send block data reports: %s",
+ bitforce->drv->name, bitforce->device_id, buf);
return false;
}
@@ -521,53 +552,52 @@ re_send:
static int64_t bitforce_get_result(struct thr_info *thr, struct work *work)
{
struct cgpu_info *bitforce = thr->cgpu;
- int fdDev = bitforce->device_fd;
unsigned int delay_time_ms;
struct timeval elapsed;
struct timeval now;
- char pdevbuf[0x100];
+ char buf[BITFORCE_BUFSIZ+1];
+ int amount;
char *pnoncebuf;
uint32_t nonce;
- if (!fdDev)
- return -1;
-
while (1) {
if (unlikely(thr->work_restart))
return 0;
mutex_lock(&bitforce->device_mutex);
- BFwrite(fdDev, "ZFX", 3);
- pdevbuf[0] = '\0';
- BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
+ usb_write(bitforce, BITFORCE_WORKSTATUS, BITFORCE_WORKSTATUS_LEN, &amount, C_REQUESTWORKSTATUS);
+ usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_GETWORKSTATUS);
mutex_unlock(&bitforce->device_mutex);
gettimeofday(&now, NULL);
timersub(&now, &bitforce->work_start_tv, &elapsed);
if (elapsed.tv_sec >= BITFORCE_LONG_TIMEOUT_S) {
- applog(LOG_ERR, "BFL%i: took %dms - longer than %dms", bitforce->device_id,
+ applog(LOG_ERR, "%s%i: took %dms - longer than %dms",
+ bitforce->drv->name, bitforce->device_id,
tv_to_ms(elapsed), BITFORCE_LONG_TIMEOUT_MS);
return 0;
}
- if (pdevbuf[0] && strncasecmp(pdevbuf, "B", 1)) /* BFL does not respond during throttling */
+ if (amount > 0 && buf[0] && strncasecmp(buf, "B", 1)) /* BFL does not respond during throttling */
break;
/* if BFL is throttling, no point checking so quickly */
- delay_time_ms = (pdevbuf[0] ? BITFORCE_CHECK_INTERVAL_MS : 2 * WORK_CHECK_INTERVAL_MS);
+ delay_time_ms = (buf[0] ? BITFORCE_CHECK_INTERVAL_MS : 2 * WORK_CHECK_INTERVAL_MS);
nmsleep(delay_time_ms);
bitforce->wait_ms += delay_time_ms;
}
if (elapsed.tv_sec > BITFORCE_TIMEOUT_S) {
- applog(LOG_ERR, "BFL%i: took %dms - longer than %dms", bitforce->device_id,
+ applog(LOG_ERR, "%s%i: took %dms - longer than %dms",
+ bitforce->drv->name, bitforce->device_id,
tv_to_ms(elapsed), BITFORCE_TIMEOUT_MS);
dev_error(bitforce, REASON_DEV_OVER_HEAT);
- if (!pdevbuf[0]) /* Only return if we got nothing after timeout - there still may be results */
+ /* Only return if we got nothing after timeout - there still may be results */
+ if (amount == 0)
return 0;
- } else if (!strncasecmp(pdevbuf, "N", 1)) {/* Hashing complete (NONCE-FOUND or NO-NONCE) */
+ } else if (!strncasecmp(buf, BITFORCE_EITHER, BITFORCE_EITHER_LEN)) {
/* Simple timing adjustment. Allow a few polls to cope with
* OS timer delays being variably reliable. wait_ms will
* always equal sleep_ms when we've waited greater than or
@@ -584,26 +614,31 @@ static int64_t bitforce_get_result(struct thr_info *thr, struct work *work)
}
if (delay_time_ms != bitforce->sleep_ms)
- applog(LOG_DEBUG, "BFL%i: Wait time changed to: %d, waited %u", bitforce->device_id, bitforce->sleep_ms, bitforce->wait_ms);
+ applog(LOG_DEBUG, "%s%i: Wait time changed to: %d, waited %u",
+ bitforce->drv->name, bitforce->device_id,
+ bitforce->sleep_ms, bitforce->wait_ms);
/* Work out the average time taken. Float for calculation, uint for display */
bitforce->avg_wait_f += (tv_to_ms(elapsed) - bitforce->avg_wait_f) / TIME_AVG_CONSTANT;
bitforce->avg_wait_d = (unsigned int) (bitforce->avg_wait_f + 0.5);
}
- applog(LOG_DEBUG, "BFL%i: waited %dms until %s", bitforce->device_id, bitforce->wait_ms, pdevbuf);
- if (!strncasecmp(&pdevbuf[2], "-", 1))
+ applog(LOG_DEBUG, "%s%i: waited %dms until %s",
+ bitforce->drv->name, bitforce->device_id,
+ bitforce->wait_ms, buf);
+ if (!strncasecmp(buf, BITFORCE_NO_NONCE, BITFORCE_NO_NONCE_MATCH))
return bitforce->nonces; /* No valid nonce found */
- else if (!strncasecmp(pdevbuf, "I", 1))
+ else if (!strncasecmp(buf, BITFORCE_IDLE, BITFORCE_IDLE_MATCH))
return 0; /* Device idle */
- else if (strncasecmp(pdevbuf, "NONCE-FOUND", 11)) {
+ else if (strncasecmp(buf, BITFORCE_NONCE, BITFORCE_NONCE_LEN)) {
bitforce->hw_errors++;
- applog(LOG_WARNING, "BFL%i: Error: Get result reports: %s", bitforce->device_id, pdevbuf);
- bitforce_clear_buffer(bitforce);
+ applog(LOG_WARNING, "%s%i: Error: Get result reports: %s",
+ bitforce->drv->name, bitforce->device_id, buf);
+ bitforce_initialise(bitforce, true);
return 0;
}
- pnoncebuf = &pdevbuf[12];
+ pnoncebuf = &buf[12];
while (1) {
hex2bin((void*)&nonce, pnoncebuf, 4);
@@ -612,7 +647,8 @@ static int64_t bitforce_get_result(struct thr_info *thr, struct work *work)
#endif
if (unlikely(bitforce->nonce_range && (nonce >= work->blk.nonce ||
(work->blk.nonce > 0 && nonce < work->blk.nonce - bitforce->nonces - 1)))) {
- applog(LOG_WARNING, "BFL%i: Disabling broken nonce range support", bitforce->device_id);
+ applog(LOG_WARNING, "%s%i: Disabling broken nonce range support",
+ bitforce->drv->name, bitforce->device_id);
bitforce->nonce_range = false;
work->blk.nonce = 0xffffffff;
bitforce->sleep_ms *= 5;
@@ -628,19 +664,16 @@ static int64_t bitforce_get_result(struct thr_info *thr, struct work *work)
return bitforce->nonces;
}
-static void bitforce_shutdown(struct thr_info *thr)
+static void bitforce_shutdown(__maybe_unused struct thr_info *thr)
{
- struct cgpu_info *bitforce = thr->cgpu;
-
- BFclose(bitforce->device_fd);
- bitforce->device_fd = 0;
+// struct cgpu_info *bitforce = thr->cgpu;
}
static void biforce_thread_enable(struct thr_info *thr)
{
struct cgpu_info *bitforce = thr->cgpu;
- bitforce_init(bitforce);
+ bitforce_initialise(bitforce, true);
}
static int64_t bitforce_scanhash(struct thr_info *thr, struct work *work, int64_t __maybe_unused max_nonce)
@@ -649,6 +682,10 @@ static int64_t bitforce_scanhash(struct thr_info *thr, struct work *work, int64_
bool send_ret;
int64_t ret;
+ // Device is gone
+ if (bitforce->usbinfo.nodev)
+ return -1;
+
send_ret = bitforce_send_work(thr, work);
if (!restart_wait(bitforce->sleep_ms))
@@ -665,11 +702,11 @@ static int64_t bitforce_scanhash(struct thr_info *thr, struct work *work, int64_
if (ret == -1) {
ret = 0;
- applog(LOG_ERR, "BFL%i: Comms error", bitforce->device_id);
+ applog(LOG_ERR, "%s%i: Comms error", bitforce->drv->name, bitforce->device_id);
dev_error(bitforce, REASON_DEV_COMMS_ERROR);
bitforce->hw_errors++;
/* empty read buffer */
- bitforce_clear_buffer(bitforce);
+ bitforce_initialise(bitforce, true);
}
return ret;
}
@@ -692,7 +729,8 @@ static bool bitforce_thread_init(struct thr_info *thr)
/* Pause each new thread at least 100ms between initialising
* so the devices aren't making calls all at the same time. */
wait = thr->id * MAX_START_DELAY_MS;
- applog(LOG_DEBUG, "BFL%i: Delaying start by %dms", bitforce->device_id, wait / 1000);
+ applog(LOG_DEBUG, "%s%d: Delaying start by %dms",
+ bitforce->drv->name, bitforce->device_id, wait / 1000);
nmsleep(wait);
return true;
@@ -712,12 +750,12 @@ static struct api_data *bitforce_api_stats(struct cgpu_info *cgpu)
return root;
}
-struct device_api bitforce_api = {
- .dname = "bitforce",
+struct device_drv bitforce_drv = {
+ .drv = DRIVER_BITFORCE,
+ .dname = "BitForce",
.name = "BFL",
- .api_detect = bitforce_detect,
+ .drv_detect = bitforce_detect,
.get_api_stats = bitforce_api_stats,
- .reinit_device = bitforce_init,
.get_statline_before = get_bitforce_statline_before,
.get_stats = bitforce_get_stats,
.identify_device = bitforce_identify,
diff --git a/driver-cpu.c b/driver-cpu.c
index 75d9a5a..4b0c086 100644
--- a/driver-cpu.c
+++ b/driver-cpu.c
@@ -758,7 +758,7 @@ static void cpu_detect()
struct cgpu_info *cgpu;
cgpu = &cpus[i];
- cgpu->api = &cpu_api;
+ cgpu->drv = &cpu_drv;
cgpu->deven = DEV_ENABLED;
cgpu->threads = 1;
cgpu->kname = algo_names[opt_algo];
@@ -768,7 +768,7 @@ static void cpu_detect()
static void reinit_cpu_device(struct cgpu_info *cpu)
{
- tq_push(thr_info[cpur_thr_id].q, cpu);
+ tq_push(control_thr[cpur_thr_id].q, cpu);
}
static bool cpu_thread_prepare(struct thr_info *thr)
@@ -843,10 +843,11 @@ CPUSearch:
return last_nonce - first_nonce + 1;
}
-struct device_api cpu_api = {
+struct device_drv cpu_drv = {
+ .drv = DRIVER_CPU,
.dname = "cpu",
.name = "CPU",
- .api_detect = cpu_detect,
+ .drv_detect = cpu_detect,
.reinit_device = reinit_cpu_device,
.thread_prepare = cpu_thread_prepare,
.can_limit_work = cpu_can_limit_work,
diff --git a/driver-cpu.h b/driver-cpu.h
index e4b4452..361ae5d 100644
--- a/driver-cpu.h
+++ b/driver-cpu.h
@@ -53,7 +53,7 @@ enum sha256_algos {
extern const char *algo_names[];
extern bool opt_usecpu;
-extern struct device_api cpu_api;
+extern struct device_drv cpu_drv;
extern char *set_algo(const char *arg, enum sha256_algos *algo);
extern void show_algo(char buf[OPT_SHOW_LEN], const enum sha256_algos *algo);
diff --git a/driver-icarus.c b/driver-icarus.c
index c979a68..4930031 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -208,7 +208,7 @@ static struct ICARUS_INFO **icarus_info;
//
static int option_offset = -1;
-struct device_api icarus_api;
+struct device_drv icarus_drv;
static void rev(unsigned char *s, size_t l)
{
@@ -571,7 +571,7 @@ static bool icarus_detect_one(const char *devpath)
/* We have a real Icarus! */
struct cgpu_info *icarus;
icarus = calloc(1, sizeof(struct cgpu_info));
- icarus->api = &icarus_api;
+ icarus->drv = &icarus_drv;
icarus->device_path = strdup(devpath);
icarus->device_fd = -1;
icarus->threads = 1;
@@ -609,7 +609,7 @@ static bool icarus_detect_one(const char *devpath)
static void icarus_detect()
{
- serial_detect(&icarus_api, icarus_detect_one);
+ serial_detect(&icarus_drv, icarus_detect_one);
}
static bool icarus_prepare(struct thr_info *thr)
@@ -668,7 +668,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
icarus = thr->cgpu;
if (icarus->device_fd == -1)
if (!icarus_prepare(thr)) {
- applog(LOG_ERR, "ICA%i: Comms error", icarus->device_id);
+ applog(LOG_ERR, "%s%i: Comms error", icarus->drv->name, icarus->device_id);
dev_error(icarus, REASON_DEV_COMMS_ERROR);
// fail the device if the reopen attempt fails
@@ -688,7 +688,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
ret = icarus_write(fd, ob_bin, sizeof(ob_bin));
if (ret) {
do_icarus_close(thr);
- applog(LOG_ERR, "ICA%i: Comms error", icarus->device_id);
+ applog(LOG_ERR, "%s%i: Comms error", icarus->drv->name, icarus->device_id);
dev_error(icarus, REASON_DEV_COMMS_ERROR);
return 0; /* This should never happen */
}
@@ -708,7 +708,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
ret = icarus_gets(nonce_bin, fd, &tv_finish, thr, info->read_count);
if (ret == ICA_GETS_ERROR) {
do_icarus_close(thr);
- applog(LOG_ERR, "ICA%i: Comms error", icarus->device_id);
+ applog(LOG_ERR, "%s%i: Comms error", icarus->drv->name, icarus->device_id);
dev_error(icarus, REASON_DEV_COMMS_ERROR);
return 0;
}
@@ -900,10 +900,11 @@ static void icarus_shutdown(struct thr_info *thr)
do_icarus_close(thr);
}
-struct device_api icarus_api = {
- .dname = "icarus",
+struct device_drv icarus_drv = {
+ .drv = DRIVER_ICARUS,
+ .dname = "Icarus",
.name = "ICA",
- .api_detect = icarus_detect,
+ .drv_detect = icarus_detect,
.get_api_stats = icarus_api_stats,
.thread_prepare = icarus_prepare,
.scanhash = icarus_scanhash,
diff --git a/driver-modminer.c b/driver-modminer.c
index c48a51b..02ad85d 100644
--- a/driver-modminer.c
+++ b/driver-modminer.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Andrew Smith
+ * Copyright 2012-2013 Andrew Smith
* Copyright 2012 Luke Dashjr
*
* This program is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@
// Limit when reducing shares_to_good
#define MODMINER_MIN_BACK 12
-struct device_api modminer_api;
+struct device_drv modminer_drv;
// 45 noops sent when detecting, in case the device was left in "start job" reading
static const char NOOP[] = MODMINER_PING "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff";
@@ -100,15 +100,15 @@ static void do_ping(struct cgpu_info *modminer)
// Don't care if it fails
err = usb_write(modminer, (char *)NOOP, sizeof(NOOP)-1, &amount, C_PING);
applog(LOG_DEBUG, "%s%u: flush noop got %d err %d",
- modminer->api->name, modminer->fpgaid, amount, err);
+ modminer->drv->name, modminer->fpgaid, amount, err);
// Clear any outstanding data
while ((err = usb_read(modminer, buf, sizeof(buf)-1, &amount, C_CLEAR)) == 0 && amount > 0)
applog(LOG_DEBUG, "%s%u: clear got %d",
- modminer->api->name, modminer->fpgaid, amount);
+ modminer->drv->name, modminer->fpgaid, amount);
applog(LOG_DEBUG, "%s%u: final clear got %d err %d",
- modminer->api->name, modminer->fpgaid, amount, err);
+ modminer->drv->name, modminer->fpgaid, amount, err);
}
static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devices *found)
@@ -121,42 +121,57 @@ static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devic
struct cgpu_info *modminer = NULL;
modminer = calloc(1, sizeof(*modminer));
- modminer->api = &modminer_api;
+ modminer->drv = &modminer_drv;
modminer->modminer_mutex = calloc(1, sizeof(*(modminer->modminer_mutex)));
mutex_init(modminer->modminer_mutex);
modminer->fpgaid = (char)0;
- if (!usb_init(modminer, dev, found))
+ if (!usb_init(modminer, dev, found)) {
+ applog(LOG_ERR, "%s detect (%d:%d) failed to initialise (incorrect device?)",
+ modminer->drv->dname,
+ (int)(modminer->usbinfo.bus_number),
+ (int)(modminer->usbinfo.device_address));
goto shin;
+ }
+
+ sprintf(devpath, "%d:%d",
+ (int)(modminer->usbinfo.bus_number),
+ (int)(modminer->usbinfo.device_address));
do_ping(modminer);
if ((err = usb_write(modminer, MODMINER_GET_VERSION, 1, &amount, C_REQUESTVERSION)) < 0 || amount != 1) {
- applog(LOG_ERR, "ModMiner detect: send version request failed (%d:%d)", amount, err);
+ applog(LOG_ERR, "%s detect (%s) send version request failed (%d:%d)",
+ modminer->drv->dname, devpath, amount, err);
goto unshin;
}
if ((err = usb_read(modminer, buf, sizeof(buf)-1, &amount, C_GETVERSION)) < 0 || amount < 1) {
if (err < 0)
- applog(LOG_ERR, "ModMiner detect: no version reply (%d)", err);
+ applog(LOG_ERR, "%s detect (%s) no version reply (%d)",
+ modminer->drv->dname, devpath, err);
else
- applog(LOG_ERR, "ModMiner detect: empty version reply (%d)", amount);
+ applog(LOG_ERR, "%s detect (%s) empty version reply (%d)",
+ modminer->drv->dname, devpath, amount);
- applog(LOG_DEBUG, "ModMiner detect: check the firmware");
+ applog(LOG_DEBUG, "%s detect (%s) check the firmware",
+ modminer->drv->dname, devpath);
goto unshin;
}
buf[amount] = '\0';
devname = strdup(buf);
- applog(LOG_DEBUG, "ModMiner identified as: %s", devname);
+ applog(LOG_DEBUG, "%s (%s) identified as: %s", modminer->drv->dname, devpath, devname);
if ((err = usb_write(modminer, MODMINER_FPGA_COUNT, 1, &amount, C_REQUESTFPGACOUNT) < 0 || amount != 1)) {
- applog(LOG_ERR, "ModMiner detect: FPGA count request failed (%d:%d)", amount, err);
+ applog(LOG_ERR, "%s detect (%s) FPGA count request failed (%d:%d)",
+ modminer->drv->dname, devpath, amount, err);
goto unshin;
}
if ((err = usb_read(modminer, buf, 1, &amount, C_GETFPGACOUNT)) < 0 || amount != 1) {
- applog(LOG_ERR, "ModMiner detect: no FPGA count reply (%d:%d)", amount, err);
+ applog(LOG_ERR, "%s detect (%s) no FPGA count reply (%d:%d)",
+ modminer->drv->dname, devpath, amount, err);
goto unshin;
}
@@ -164,16 +179,19 @@ static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devic
// can detect with modminer->cgusb->serial ?
if (buf[0] == 0) {
- applog(LOG_ERR, "ModMiner detect: zero FPGA count from %s", devname);
+ applog(LOG_ERR, "%s detect (%s) zero FPGA count from %s",
+ modminer->drv->dname, devpath, devname);
goto unshin;
}
if (buf[0] < 1 || buf[0] > 4) {
- applog(LOG_ERR, "ModMiner detect: invalid FPGA count (%u) from %s", buf[0], devname);
+ applog(LOG_ERR, "%s detect (%s) invalid FPGA count (%u) from %s",
+ modminer->drv->dname, devpath, buf[0], devname);
goto unshin;
}
- applog(LOG_DEBUG, "ModMiner %s has %u FPGAs", devname, buf[0]);
+ applog(LOG_DEBUG, "%s (%s) %s has %u FPGAs",
+ modminer->drv->dname, devpath, devname, buf[0]);
modminer->name = devname;
@@ -182,19 +200,21 @@ static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devic
for (i = 0; i < buf[0]; i++) {
struct cgpu_info *tmp = calloc(1, sizeof(*tmp));
- tmp->api = modminer->api;
+ tmp->drv = copy_drv(modminer->drv);
tmp->name = devname;
sprintf(devpath, "%d:%d:%d",
- (int)(modminer->usbdev->bus_number),
- (int)(modminer->usbdev->device_address),
+ (int)(modminer->usbinfo.bus_number),
+ (int)(modminer->usbinfo.device_address),
i);
tmp->device_path = strdup(devpath);
tmp->usbdev = modminer->usbdev;
+ tmp->usbinfo.bus_number = modminer->usbinfo.bus_number;
+ tmp->usbinfo.device_address = modminer->usbinfo.device_address;
// Only the first copy gets the already used stats
if (!added)
- tmp->usbstat = modminer->usbstat;
+ tmp->usbinfo.usbstat = modminer->usbinfo.usbstat;
tmp->fpgaid = (char)i;
tmp->modminer_mutex = modminer->modminer_mutex;
tmp->deven = DEV_ENABLED;
@@ -202,6 +222,8 @@ static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devic
if (!add_cgpu(tmp)) {
free(tmp->device_path);
+ if (tmp->drv->copy)
+ free(tmp->drv);
free(tmp);
goto unshin;
}
@@ -211,6 +233,9 @@ static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devic
added = true;
}
+ if (modminer->drv->copy)
+ free(modminer->drv);
+
free(modminer);
return true;
@@ -223,6 +248,9 @@ shin:
if (!added)
free(modminer->modminer_mutex);
+ if (modminer->drv->copy)
+ free(modminer->drv);
+
free(modminer);
if (added)
@@ -233,7 +261,7 @@ shin:
static void modminer_detect()
{
- usb_detect(&modminer_api, modminer_detect_one);
+ usb_detect(&modminer_drv, modminer_detect_one);
}
static bool get_expect(struct cgpu_info *modminer, FILE *f, char c)
@@ -242,13 +270,13 @@ static bool get_expect(struct cgpu_info *modminer, FILE *f, char c)
if (fread(&buf, 1, 1, f) != 1) {
applog(LOG_ERR, "%s%u: Error (%d) reading bitstream (%c)",
- modminer->api->name, modminer->device_id, errno, c);
+ modminer->drv->name, modminer->device_id, errno, c);
return false;
}
if (buf != c) {
- applog(LOG_ERR, "%s%u: firmware code mismatch (%c)",
- modminer->api->name, modminer->device_id, c);
+ applog(LOG_ERR, "%s%u: bitstream code mismatch (%c)",
+ modminer->drv->name, modminer->device_id, c);
return false;
}
@@ -262,7 +290,7 @@ static bool get_info(struct cgpu_info *modminer, FILE *f, char *buf, int bufsiz,
if (fread(siz, 2, 1, f) != 1) {
applog(LOG_ERR, "%s%u: Error (%d) reading bitstream '%s' len",
- modminer->api->name, modminer->device_id, errno, name);
+ modminer->drv->name, modminer->device_id, errno, name);
return false;
}
@@ -270,13 +298,13 @@ static bool get_info(struct cgpu_info *modminer, FILE *f, char *buf, int bufsiz,
if (len >= bufsiz) {
applog(LOG_ERR, "%s%u: Bitstream '%s' len too large (%d)",
- modminer->api->name, modminer->device_id, name, len);
+ modminer->drv->name, modminer->device_id, name, len);
return false;
}
if (fread(buf, len, 1, f) != 1) {
applog(LOG_ERR, "%s%u: Error (%d) reading bitstream '%s'", errno,
- modminer->api->name, modminer->device_id, errno, name);
+ modminer->drv->name, modminer->device_id, errno, name);
return false;
}
@@ -302,7 +330,7 @@ static bool get_status_timeout(struct cgpu_info *modminer, char *msg, unsigned i
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error (%d:%d) getting %s reply",
- modminer->api->name, modminer->device_id, amount, err, msg);
+ modminer->drv->name, modminer->device_id, amount, err, msg);
return false;
}
@@ -311,7 +339,7 @@ static bool get_status_timeout(struct cgpu_info *modminer, char *msg, unsigned i
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error, invalid %s reply (was %d should be 1)",
- modminer->api->name, modminer->device_id, msg, buf[0]);
+ modminer->drv->name, modminer->device_id, msg, buf[0]);
return false;
}
@@ -343,7 +371,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error (%d) opening bitstream file %s",
- modminer->api->name, modminer->device_id, errno, bsfile);
+ modminer->drv->name, modminer->device_id, errno, bsfile);
return false;
}
@@ -352,7 +380,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error (%d) reading bitstream magic",
- modminer->api->name, modminer->device_id, errno);
+ modminer->drv->name, modminer->device_id, errno);
goto dame;
}
@@ -361,7 +389,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: bitstream has incorrect magic (%u,%u) instead of (%u,%u)",
- modminer->api->name, modminer->device_id,
+ modminer->drv->name, modminer->device_id,
buf[0], buf[1],
BITSTREAM_MAGIC_0, BITSTREAM_MAGIC_1);
@@ -372,7 +400,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error (%d) bitstream seek failed",
- modminer->api->name, modminer->device_id, errno);
+ modminer->drv->name, modminer->device_id, errno);
goto dame;
}
@@ -384,7 +412,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
goto undame;
applog(LOG_DEBUG, "%s%u: bitstream file '%s' info:",
- modminer->api->name, modminer->device_id, bsfile);
+ modminer->drv->name, modminer->device_id, bsfile);
applog(LOG_DEBUG, " Design name: '%s'", buf);
@@ -399,7 +427,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Bad usercode in bitstream file",
- modminer->api->name, modminer->device_id);
+ modminer->drv->name, modminer->device_id);
goto dame;
}
@@ -408,7 +436,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: bitstream doesn't support user code",
- modminer->api->name, modminer->device_id);
+ modminer->drv->name, modminer->device_id);
goto dame;
}
@@ -446,7 +474,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error (%d) reading bitstream data len",
- modminer->api->name, modminer->device_id, errno);
+ modminer->drv->name, modminer->device_id, errno);
goto dame;
}
@@ -460,7 +488,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
*ptr = '\0';
applog(LOG_WARNING, "%s%u: Programming all FPGA on %s ... Mining will not start until complete",
- modminer->api->name, modminer->device_id, devmsg);
+ modminer->drv->name, modminer->device_id, devmsg);
buf[0] = MODMINER_PROGRAM;
buf[1] = fpgaid;
@@ -473,7 +501,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Program init failed (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
goto dame;
}
@@ -492,7 +520,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: bitstream file read error %d (%d bytes left)",
- modminer->api->name, modminer->device_id, errno, len);
+ modminer->drv->name, modminer->device_id, errno, len);
goto dame;
}
@@ -507,7 +535,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
if (opt_debug)
applog(LOG_DEBUG, "%s%u: Program timeout (%d:%d) sent %d tries %d",
- modminer->api->name, modminer->device_id,
+ modminer->drv->name, modminer->device_id,
amount, err, remaining, tries);
if (!get_status(modminer, "write status", C_PROGRAMSTATUS2))
@@ -517,7 +545,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Program failed (%d:%d) sent %d",
- modminer->api->name, modminer->device_id, amount, err, remaining);
+ modminer->drv->name, modminer->device_id, amount, err, remaining);
goto dame;
}
@@ -532,7 +560,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
if (upto >= nextmsg) {
applog(LOG_WARNING,
"%s%u: Programming %.1f%% (%d out of %d)",
- modminer->api->name, modminer->device_id, upto*100, (totlen - len), totlen);
+ modminer->drv->name, modminer->device_id, upto*100, (totlen - len), totlen);
nextmsg += 0.1;
}
@@ -542,7 +570,7 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
goto undame;
applog(LOG_WARNING, "%s%u: Programming completed for all FPGA on %s",
- modminer->api->name, modminer->device_id, devmsg);
+ modminer->drv->name, modminer->device_id, devmsg);
// Give it a 2/3s delay after programming
nmsleep(666);
@@ -599,6 +627,7 @@ static bool modminer_fpga_prepare(struct thr_info *thr)
*
* N.B. clock must always be a multiple of 2
*/
+static const char *clocknodev = "clock failed - no device";
static const char *clockoldwork = "clock already changed for this work";
static const char *clocktoolow = "clock too low";
static const char *clocktoohi = "clock too high";
@@ -612,6 +641,10 @@ static const char *modminer_delta_clock(struct thr_info *thr, int delta, bool te
unsigned char cmd[6], buf[1];
int err, amount;
+ // Device is gone
+ if (modminer->usbinfo.nodev)
+ return clocknodev;
+
// Only do once if multiple shares per work or multiple reasons
if (!state->new_work && !force)
return clockoldwork;
@@ -653,7 +686,7 @@ static const char *modminer_delta_clock(struct thr_info *thr, int delta, bool te
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error writing set clock speed (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
return clocksetfail;
}
@@ -662,7 +695,7 @@ static const char *modminer_delta_clock(struct thr_info *thr, int delta, bool te
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error reading set clock speed (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
return clockreplyfail;
}
@@ -670,7 +703,7 @@ static const char *modminer_delta_clock(struct thr_info *thr, int delta, bool te
mutex_unlock(modminer->modminer_mutex);
applog(LOG_WARNING, "%s%u: Set clock speed %sto %u",
- modminer->api->name, modminer->device_id,
+ modminer->drv->name, modminer->device_id,
(delta < 0) ? "down " : (delta > 0 ? "up " : ""),
modminer->clock);
@@ -691,7 +724,7 @@ static bool modminer_fpga_init(struct thr_info *thr)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error requesting USER code (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
return false;
}
@@ -700,14 +733,14 @@ static bool modminer_fpga_init(struct thr_info *thr)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Error reading USER code (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
return false;
}
if (memcmp(buf, BISTREAM_USER_ID, 4)) {
applog(LOG_ERR, "%s%u: FPGA not programmed",
- modminer->api->name, modminer->device_id);
+ modminer->drv->name, modminer->device_id);
if (!modminer_fpga_upload_bitstream(modminer))
return false;
@@ -717,7 +750,7 @@ static bool modminer_fpga_init(struct thr_info *thr)
mutex_unlock(modminer->modminer_mutex);
applog(LOG_DEBUG, "%s%u: FPGA is already programmed :)",
- modminer->api->name, modminer->device_id);
+ modminer->drv->name, modminer->device_id);
}
modminer->clock = MODMINER_DEF_CLOCK;
@@ -767,13 +800,10 @@ static bool modminer_start_work(struct thr_info *thr)
mutex_lock(modminer->modminer_mutex);
if ((err = usb_write(modminer, (char *)(state->next_work_cmd), 46, &amount, C_SENDWORK)) < 0 || amount != 46) {
-// TODO: err = LIBUSB_ERROR_NO_DEVICE means the MMQ disappeared
-// - need to delete it and rescan for it? (after a delay?)
-// but check all (4) disappeared
mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Start work failed (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
return false;
}
@@ -799,6 +829,10 @@ static void check_temperature(struct thr_info *thr)
int tbytes, tamount;
int amount;
+ // Device is gone
+ if (modminer->usbinfo.nodev)
+ return;
+
if (state->one_byte_temp) {
cmd[0] = MODMINER_TEMP1;
tbytes = 1;
@@ -827,14 +861,14 @@ static void check_temperature(struct thr_info *thr)
if (modminer->temp < MODMINER_RECOVER_TEMP) {
state->overheated = false;
applog(LOG_WARNING, "%s%u: Recovered, temp less than (%.1f) now %.3f",
- modminer->api->name, modminer->device_id,
+ modminer->drv->name, modminer->device_id,
MODMINER_RECOVER_TEMP, modminer->temp);
}
}
else if (modminer->temp >= MODMINER_OVERHEAT_TEMP) {
if (modminer->temp >= MODMINER_CUTOFF_TEMP) {
applog(LOG_WARNING, "%s%u: Hit thermal cutoff limit! (%.1f) at %.3f",
- modminer->api->name, modminer->device_id,
+ modminer->drv->name, modminer->device_id,
MODMINER_CUTOFF_TEMP, modminer->temp);
modminer_delta_clock(thr, MODMINER_CLOCK_CUTOFF, true, false);
@@ -842,7 +876,7 @@ static void check_temperature(struct thr_info *thr)
dev_error(modminer, REASON_DEV_THERMAL_CUTOFF);
} else {
applog(LOG_WARNING, "%s%u: Overheat limit (%.1f) reached %.3f",
- modminer->api->name, modminer->device_id,
+ modminer->drv->name, modminer->device_id,
MODMINER_OVERHEAT_TEMP, modminer->temp);
// If it's defined to be 0 then don't call modminer_delta_clock()
@@ -883,6 +917,10 @@ static uint64_t modminer_process_results(struct thr_info *thr)
double timeout;
int temploop;
+ // Device is gone
+ if (modminer->usbinfo.nodev)
+ return -1;
+
// If we are overheated it will just keep checking for results
// since we can't stop the work
// The next work will not start until the temp drops
@@ -896,9 +934,6 @@ static uint64_t modminer_process_results(struct thr_info *thr)
while (1) {
mutex_lock(modminer->modminer_mutex);
if ((err = usb_write(modminer, cmd, 2, &amount, C_REQUESTWORKSTATUS)) < 0 || amount != 2) {
-// TODO: err = LIBUSB_ERROR_NO_DEVICE means the MMQ disappeared
-// - need to delete it and rescan for it? (after a delay?)
-// but check all (4) disappeared
mutex_unlock(modminer->modminer_mutex);
// timeoutloop never resets so the timeouts can't
@@ -909,7 +944,7 @@ static uint64_t modminer_process_results(struct thr_info *thr)
}
applog(LOG_ERR, "%s%u: Error sending (get nonce) (%d:%d)",
- modminer->api->name, modminer->device_id, amount, err);
+ modminer->drv->name, modminer->device_id, amount, err);
return -1;
}
@@ -936,7 +971,7 @@ static uint64_t modminer_process_results(struct thr_info *thr)
}
applog(LOG_ERR, "%s%u: Error reading (get nonce) (%d:%d)",
- modminer->api->name, modminer->device_id, amount+amount2, err);
+ modminer->drv->name, modminer->device_id, amount+amount2, err);
}
if (memcmp(&nonce, "\xff\xff\xff\xff", 4)) {
@@ -975,7 +1010,7 @@ static uint64_t modminer_process_results(struct thr_info *thr)
if (state->death_stage_one) {
modminer_delta_clock(thr, MODMINER_CLOCK_DEAD, false, true);
applog(LOG_ERR, "%s%u: DEATH clock down",
- modminer->api->name, modminer->device_id);
+ modminer->drv->name, modminer->device_id);
// reset the death info and DISABLE it
state->last_nonce.tv_sec = 0;
@@ -985,7 +1020,7 @@ static uint64_t modminer_process_results(struct thr_info *thr)
} else {
modminer_delta_clock(thr, MODMINER_CLOCK_DEAD, false, true);
applog(LOG_ERR, "%s%u: death clock down",
- modminer->api->name, modminer->device_id);
+ modminer->drv->name, modminer->device_id);
state->death_stage_one = true;
}
@@ -1045,6 +1080,10 @@ static int64_t modminer_scanhash(struct thr_info *thr, struct work *work, int64_
bool startwork;
struct timeval tv1, tv2;
+ // Device is gone
+ if (thr->cgpu->usbinfo.nodev)
+ return -1;
+
// Don't start new work if overheated
if (state->overheated == true) {
gettimeofday(&tv1, NULL);
@@ -1054,6 +1093,10 @@ static int64_t modminer_scanhash(struct thr_info *thr, struct work *work, int64_
while (state->overheated == true) {
check_temperature(thr);
+ // Device is gone
+ if (thr->cgpu->usbinfo.nodev)
+ return -1;
+
if (state->overheated == true) {
gettimeofday(&tv2, NULL);
@@ -1141,10 +1184,11 @@ static char *modminer_set_device(struct cgpu_info *modminer, char *option, char
return replybuf;
}
-struct device_api modminer_api = {
- .dname = "modminer",
+struct device_drv modminer_drv = {
+ .drv = DRIVER_MODMINER,
+ .dname = "ModMiner",
.name = "MMQ",
- .api_detect = modminer_detect,
+ .drv_detect = modminer_detect,
.get_statline_before = get_modminer_statline_before,
.set_device = modminer_set_device,
.thread_prepare = modminer_fpga_prepare,
diff --git a/driver-opencl.c b/driver-opencl.c
index 01e7019..299d8c4 100644
--- a/driver-opencl.c
+++ b/driver-opencl.c
@@ -50,24 +50,24 @@ extern int gpur_thr_id;
extern bool opt_noadl;
extern bool have_opencl;
-
-
extern void *miner_thread(void *userdata);
extern int dev_from_id(int thr_id);
extern void tailsprintf(char *f, const char *fmt, ...);
extern void wlog(const char *f, ...);
extern void decay_time(double *f, double fadd);
-
/**********************************************/
+#ifdef HAVE_OPENCL
+struct device_drv opencl_drv;
+#endif
+
#ifdef HAVE_ADL
extern float gpu_temp(int gpu);
extern int gpu_fanspeed(int gpu);
extern int gpu_fanpercent(int gpu);
#endif
-
#ifdef HAVE_OPENCL
char *set_vector(char *arg)
{
@@ -591,28 +591,20 @@ char *set_intensity(char *arg)
return NULL;
}
-#endif
-
-
-#ifdef HAVE_OPENCL
-struct device_api opencl_api;
char *print_ndevs_and_exit(int *ndevs)
{
opt_log_output = true;
- opencl_api.api_detect();
+ opencl_drv.drv_detect();
clear_adl(*ndevs);
applog(LOG_INFO, "%i GPU devices max detected", *ndevs);
exit(*ndevs);
}
#endif
-
struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */
struct cgpu_info *cpus;
-
-
#ifdef HAVE_OPENCL
/* In dynamic mode, only the first thread of each device will be in use.
@@ -624,7 +616,11 @@ void pause_dynamic_threads(int gpu)
int i;
for (i = 1; i < cgpu->threads; i++) {
- struct thr_info *thr = &thr_info[i];
+ struct thr_info *thr;
+
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
if (!thr->pause && cgpu->dynamic) {
applog(LOG_WARNING, "Disabling extra threads due to dynamic mode.");
@@ -637,9 +633,6 @@ void pause_dynamic_threads(int gpu)
}
}
-
-struct device_api opencl_api;
-
#endif /* HAVE_OPENCL */
#if defined(HAVE_OPENCL) && defined(HAVE_CURSES)
@@ -716,7 +709,9 @@ retry:
else
wlog("%d\n", gpus[gpu].intensity);
for (i = 0; i < mining_threads; i++) {
- thr = &thr_info[i];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
if (thr->cgpu != cgpu)
continue;
get_datestamp(checkin, &thr->last);
@@ -771,9 +766,11 @@ retry:
}
gpus[selected].deven = DEV_ENABLED;
for (i = 0; i < mining_threads; ++i) {
- thr = &thr_info[i];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[i];
+ mutex_unlock(&mining_thr_lock);
cgpu = thr->cgpu;
- if (cgpu->api != &opencl_api)
+ if (cgpu->drv->drv != DRIVER_OPENCL)
continue;
if (dev_from_id(i) != selected)
continue;
@@ -1158,14 +1155,18 @@ select_cgpu:
gpu = cgpu->device_id;
for (thr_id = 0; thr_id < mining_threads; ++thr_id) {
- thr = &thr_info[thr_id];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[thr_id];
+ mutex_unlock(&mining_thr_lock);
cgpu = thr->cgpu;
- if (cgpu->api != &opencl_api)
+ if (cgpu->drv->drv != DRIVER_OPENCL)
continue;
if (dev_from_id(thr_id) != gpu)
continue;
- thr = &thr_info[thr_id];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[thr_id];
+ mutex_unlock(&mining_thr_lock);
if (!thr) {
applog(LOG_WARNING, "No reference to thread %d exists", thr_id);
continue;
@@ -1183,9 +1184,11 @@ select_cgpu:
for (thr_id = 0; thr_id < mining_threads; ++thr_id) {
int virtual_gpu;
- thr = &thr_info[thr_id];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[thr_id];
+ mutex_unlock(&mining_thr_lock);
cgpu = thr->cgpu;
- if (cgpu->api != &opencl_api)
+ if (cgpu->drv->drv != DRIVER_OPENCL)
continue;
if (dev_from_id(thr_id) != gpu)
continue;
@@ -1220,9 +1223,11 @@ select_cgpu:
get_datestamp(cgpu->init, &now);
for (thr_id = 0; thr_id < mining_threads; ++thr_id) {
- thr = &thr_info[thr_id];
+ mutex_lock(&mining_thr_lock);
+ thr = mining_thr[thr_id];
+ mutex_unlock(&mining_thr_lock);
cgpu = thr->cgpu;
- if (cgpu->api != &opencl_api)
+ if (cgpu->drv->drv != DRIVER_OPENCL)
continue;
if (dev_from_id(thr_id) != gpu)
continue;
@@ -1243,8 +1248,6 @@ void *reinit_gpu(__maybe_unused void *userdata)
#ifdef HAVE_OPENCL
-struct device_api opencl_api;
-
static void opencl_detect()
{
int i;
@@ -1263,7 +1266,7 @@ static void opencl_detect()
cgpu = &gpus[i];
cgpu->deven = DEV_ENABLED;
- cgpu->api = &opencl_api;
+ cgpu->drv = &opencl_drv;
cgpu->device_id = i;
cgpu->threads = opt_g_threads;
cgpu->virtual_gpu = i;
@@ -1276,7 +1279,7 @@ static void opencl_detect()
static void reinit_opencl_device(struct cgpu_info *gpu)
{
- tq_push(thr_info[gpur_thr_id].q, gpu);
+ tq_push(control_thr[gpur_thr_id].q, gpu);
}
#ifdef HAVE_ADL
@@ -1570,10 +1573,11 @@ static void opencl_thread_shutdown(struct thr_info *thr)
clReleaseContext(clState->context);
}
-struct device_api opencl_api = {
+struct device_drv opencl_drv = {
+ .drv = DRIVER_OPENCL,
.dname = "opencl",
.name = "GPU",
- .api_detect = opencl_detect,
+ .drv_detect = opencl_detect,
.reinit_device = reinit_opencl_device,
#ifdef HAVE_ADL
.get_statline_before = get_opencl_statline_before,
diff --git a/driver-opencl.h b/driver-opencl.h
index c1d6182..22bd9ec 100644
--- a/driver-opencl.h
+++ b/driver-opencl.h
@@ -30,6 +30,6 @@ extern void pause_dynamic_threads(int gpu);
extern bool have_opencl;
extern int opt_platform_id;
-extern struct device_api opencl_api;
+extern struct device_drv opencl_drv;
#endif /* __DEVICE_GPU_H__ */
diff --git a/driver-ztex.c b/driver-ztex.c
index 23aa97e..4a61a5c 100644
--- a/driver-ztex.c
+++ b/driver-ztex.c
@@ -30,7 +30,7 @@
#define GOLDEN_BACKLOG 5
-struct device_api ztex_api;
+struct device_drv ztex_drv;
// Forward declarations
static void ztex_disable(struct thr_info* thr);
@@ -68,7 +68,7 @@ static void ztex_detect(void)
for (i = 0; i < cnt; i++) {
ztex = calloc(1, sizeof(struct cgpu_info));
- ztex->api = &ztex_api;
+ ztex->drv = &ztex_drv;
ztex->device_ztex = ztex_devices[i]->dev;
ztex->threads = 1;
ztex->device_ztex->fpgaNum = 0;
@@ -82,7 +82,7 @@ static void ztex_detect(void)
for (j = 1; j < fpgacount; j++) {
ztex = calloc(1, sizeof(struct cgpu_info));
- ztex->api = &ztex_api;
+ ztex->drv = &ztex_drv;
ztex_slave = calloc(1, sizeof(struct libztex_device));
memcpy(ztex_slave, ztex_devices[i]->dev, sizeof(struct libztex_device));
ztex->device_ztex = ztex_slave;
@@ -394,10 +394,10 @@ static void ztex_disable(struct thr_info *thr)
ztex_shutdown(thr);
}
-struct device_api ztex_api = {
+struct device_drv ztex_drv = {
.dname = "ztex",
.name = "ZTX",
- .api_detect = ztex_detect,
+ .drv_detect = ztex_detect,
.get_statline_before = ztex_statline_before,
.thread_prepare = ztex_prepare,
.scanhash = ztex_scanhash,
diff --git a/findnonce.c b/findnonce.c
index bf39a12..fcf75f2 100644
--- a/findnonce.c
+++ b/findnonce.c
@@ -204,7 +204,7 @@ static void *postcalc_hash(void *userdata)
* end of the res[] array */
if (unlikely(pcd->res[FOUND] & ~FOUND)) {
applog(LOG_WARNING, "%s%d: invalid nonce count - HW error",
- thr->cgpu->api->name, thr->cgpu->device_id);
+ thr->cgpu->drv->name, thr->cgpu->device_id);
hw_errors++;
thr->cgpu->hw_errors++;
pcd->res[FOUND] &= FOUND;
diff --git a/fpgautils.c b/fpgautils.c
index 487395c..307bec4 100644
--- a/fpgautils.c
+++ b/fpgautils.c
@@ -104,14 +104,14 @@ int serial_autodetect_devserial(__maybe_unused detectone_func_t detectone, __may
#endif
}
-int _serial_detect(struct device_api *api, detectone_func_t detectone, autoscan_func_t autoscan, bool forceauto)
+int _serial_detect(struct device_drv *drv, detectone_func_t detectone, autoscan_func_t autoscan, bool forceauto)
{
struct string_elist *iter, *tmp;
const char *dev, *colon;
bool inhibitauto = false;
char found = 0;
- size_t namel = strlen(api->name);
- size_t dnamel = strlen(api->dname);
+ size_t namel = strlen(drv->name);
+ size_t dnamel = strlen(drv->dname);
list_for_each_entry_safe(iter, tmp, &scan_devices, list) {
dev = iter->string;
@@ -119,8 +119,8 @@ int _serial_detect(struct device_api *api, detectone_func_t detectone, autoscan_
size_t idlen = colon - dev;
// allow either name:device or dname:device
- if ((idlen != namel || strncasecmp(dev, api->name, idlen))
- && (idlen != dnamel || strncasecmp(dev, api->dname, idlen)))
+ if ((idlen != namel || strncasecmp(dev, drv->name, idlen))
+ && (idlen != dnamel || strncasecmp(dev, drv->dname, idlen)))
continue;
dev = colon + 1;
diff --git a/fpgautils.h b/fpgautils.h
index 1802548..b979b6c 100644
--- a/fpgautils.h
+++ b/fpgautils.h
@@ -16,13 +16,13 @@
typedef bool(*detectone_func_t)(const char*);
typedef int(*autoscan_func_t)();
-extern int _serial_detect(struct device_api *api, detectone_func_t, autoscan_func_t, bool force_autoscan);
-#define serial_detect_fauto(api, detectone, autoscan) \
- _serial_detect(api, detectone, autoscan, true)
-#define serial_detect_auto(api, detectone, autoscan) \
- _serial_detect(api, detectone, autoscan, false)
-#define serial_detect(api, detectone) \
- _serial_detect(api, detectone, NULL, false)
+extern int _serial_detect(struct device_drv *drv, detectone_func_t, autoscan_func_t, bool force_autoscan);
+#define serial_detect_fauto(drv, detectone, autoscan) \
+ _serial_detect(drv, detectone, autoscan, true)
+#define serial_detect_auto(drv, detectone, autoscan) \
+ _serial_detect(drv, detectone, autoscan, false)
+#define serial_detect(drv, detectone) \
+ _serial_detect(drv, detectone, NULL, false)
extern int serial_autodetect_devserial(detectone_func_t, const char *prodname);
extern int serial_autodetect_udev(detectone_func_t, const char *prodname);
diff --git a/miner.h b/miner.h
index df2888e..f25b626 100644
--- a/miner.h
+++ b/miner.h
@@ -114,7 +114,7 @@ static inline int fsync (int fd)
#include "libztex.h"
#endif
-#ifdef USE_MODMINER
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
#include "usbutils.h"
#endif
@@ -196,6 +196,15 @@ static inline int fsync (int fd)
#endif
#endif
+enum drv_driver {
+ DRIVER_OPENCL,
+ DRIVER_ICARUS,
+ DRIVER_BITFORCE,
+ DRIVER_MODMINER,
+ DRIVER_ZTEX,
+ DRIVER_CPU,
+};
+
enum alive {
LIFE_WELL,
LIFE_SICK,
@@ -263,12 +272,14 @@ struct api_data;
struct thr_info;
struct work;
-struct device_api {
+struct device_drv {
+ enum drv_driver drv;
+
char *dname;
char *name;
- // API-global functions
- void (*api_detect)();
+ // DRV-global functions
+ void (*drv_detect)();
// Device-specific functions
void (*reinit_device)(struct cgpu_info *);
@@ -288,8 +299,13 @@ struct device_api {
void (*hw_error)(struct thr_info *);
void (*thread_shutdown)(struct thr_info *);
void (*thread_enable)(struct thr_info *);
+
+ // Does it need to be free()d?
+ bool copy;
};
+extern struct device_drv *copy_drv(struct device_drv*);
+
enum dev_enable {
DEV_ENABLED,
DEV_DISABLED,
@@ -359,13 +375,15 @@ struct cgminer_pool_stats {
uint32_t max_diff_count;
uint64_t times_sent;
uint64_t bytes_sent;
+ uint64_t net_bytes_sent;
uint64_t times_received;
uint64_t bytes_received;
+ uint64_t net_bytes_received;
};
struct cgpu_info {
int cgminer_id;
- struct device_api *api;
+ struct device_drv *drv;
int device_id;
char *name;
char *device_path;
@@ -374,13 +392,17 @@ struct cgpu_info {
#ifdef USE_ZTEX
struct libztex_device *device_ztex;
#endif
-#ifdef USE_MODMINER
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
struct cg_usb_device *usbdev;
#endif
+#ifdef USE_ICARUS
int device_fd;
+#endif
};
+#if defined(USE_MODMINER) || defined(USE_BITFORCE)
+ struct cg_usb_info usbinfo;
+#endif
#ifdef USE_MODMINER
- int usbstat;
char fpgaid;
unsigned char clock;
pthread_mutex_t *modminer_mutex;
@@ -715,6 +737,7 @@ extern pthread_mutex_t cgusb_lock;
extern pthread_mutex_t hash_lock;
extern pthread_mutex_t console_lock;
extern pthread_mutex_t ch_lock;
+extern pthread_mutex_t mining_thr_lock;
extern pthread_mutex_t restart_lock;
extern pthread_cond_t restart_cond;
@@ -739,6 +762,7 @@ extern void api(int thr_id);
extern struct pool *current_pool(void);
extern int enabled_pools;
extern bool detect_stratum(struct pool *pool, char *url);
+extern void print_summary(void);
extern struct pool *add_pool(void);
extern void add_pool_details(struct pool *pool, bool live, char *url, char *user, char *pass);
@@ -761,7 +785,8 @@ extern int num_processors;
extern int hw_errors;
extern bool use_syslog;
extern bool opt_quiet;
-extern struct thr_info *thr_info;
+extern struct thr_info *control_thr;
+extern struct thr_info **mining_thr;
extern struct cgpu_info gpus[MAX_GPUDEVICES];
extern int gpu_threads;
#ifdef USE_SCRYPT
@@ -920,6 +945,7 @@ struct pool {
time_t last_share_time;
double last_share_diff;
+ uint64_t best_diff;
struct cgminer_stats cgminer_stats;
struct cgminer_pool_stats cgminer_pool_stats;
@@ -1056,6 +1082,8 @@ extern void kill_work(void);
extern void switch_pools(struct pool *selected);
extern void remove_pool(struct pool *pool);
extern void write_config(FILE *fcfg);
+extern void zero_bestshare(void);
+extern void zero_stats(void);
extern void default_save_file(char *filename);
extern bool log_curses_only(int prio, const char *f, va_list ap);
extern void clear_logwin(void);
diff --git a/miner.php b/miner.php
index 8c393ac..396121b 100644
--- a/miner.php
+++ b/miner.php
@@ -8,7 +8,7 @@ global $checklastshare, $poolinputs, $hidefields;
global $ignorerefresh, $changerefresh, $autorefresh;
global $allowcustompages, $customsummarypages;
global $miner_font_family, $miner_font_size;
-global $colouroverride, $placebuttons;
+global $colouroverride, $placebuttons, $userlist;
#
# See API-README for more details of these variables and how
# to configure miner.php
@@ -20,6 +20,9 @@ $title = 'Mine';
# Set $readonly to false then it will check cgminer 'privileged'
$readonly = false;
#
+# Set $userlist to null to allow anyone access or read API-README
+$userlist = null;
+#
# Set $notify to false to NOT attempt to display the notify command
# Set $notify to true to attempt to display the notify command
$notify = true;
@@ -113,16 +116,17 @@ $poolspage = array(
'POOL.Difficulty Rejected=Diff Rej',
'POOL.Has Stratum=Stratum', 'POOL.Stratum Active=StrAct',
'POOL.Has GBT=GBT', 'STATS.Times Sent=TSent',
- 'STATS.Bytes Sent=BSent', 'STATS.Times Recv=TRecv',
- 'STATS.Bytes Recv=BRecv'));
+ 'STATS.Bytes Sent=BSent', 'STATS.Net Bytes Sent=NSent',
+ 'STATS.Times Recv=TRecv', 'STATS.Bytes Recv=BRecv',
+ 'STATS.Net Bytes Recv=NRecv'));
#
$poolssum = array(
'SUMMARY' => array('MHS av', 'Found Blocks', 'Accepted',
'Rejected', 'Utility', 'Hardware Errors',
'Work Utility'),
'POOL+STATS' => array('POOL.Difficulty Accepted', 'POOL.Difficulty Rejected',
- 'STATS.Times Sent', 'STATS.Bytes Sent',
- 'STATS.Times Recv', 'STATS.Bytes Recv'));
+ 'STATS.Times Sent', 'STATS.Bytes Sent', 'STATS.Net Bytes Sent',
+ 'STATS.Times Recv', 'STATS.Bytes Recv', 'STATS.Net Bytes Recv'));
#
$poolsext = array(
'POOL+STATS' => array(
@@ -130,7 +134,8 @@ $poolsext = array(
'group' => array('POOL.URL', 'POOL.Has Stratum', 'POOL.Stratum Active', 'POOL.Has GBT'),
'calc' => array('POOL.Difficulty Accepted' => 'sum', 'POOL.Difficulty Rejected' => 'sum',
'STATS.Times Sent' => 'sum', 'STATS.Bytes Sent' => 'sum',
- 'STATS.Times Recv' => 'sum', 'STATS.Bytes Recv' => 'sum'),
+ 'STATS.Net Bytes Sent' => 'sum', 'STATS.Times Recv' => 'sum',
+ 'STATS.Bytes Recv' => 'sum', 'STATS.Net Bytes Recv' => 'sum'),
'having' => array(array('STATS.Bytes Recv', '>', 0)))
);
@@ -212,6 +217,10 @@ $rigerror = array();
global $rownum;
$rownum = 0;
#
+// Login
+global $ses;
+$ses = 'rutroh';
+#
function getcss($cssname, $dom = false)
{
global $colourtable, $colouroverride;
@@ -239,7 +248,7 @@ function getdom($domname)
return getcss($domname, true);
}
#
-function htmlhead($checkapi, $rig, $pg = null)
+function htmlhead($checkapi, $rig, $pg = null, $noscript = false)
{
global $title, $miner_font_family, $miner_font_size;
global $error, $readonly, $poolinputs, $here;
@@ -285,8 +294,10 @@ td.lst { $miner_font ".getcss('td.lst')."}
td.hi { $miner_font ".getcss('td.hi')."}
td.lo { $miner_font ".getcss('td.lo')."}
</style>
-</head><body".getdom('body').">
-<script type='text/javascript'>
+</head><body".getdom('body').">\n";
+if ($noscript === false)
+{
+echo "<script type='text/javascript'>
function pr(a,m){if(m!=null){if(!confirm(m+'?'))return}window.location='$here?ref=$autorefresh'+a}\n";
if ($ignorerefresh == false)
@@ -300,8 +311,9 @@ function prs2(a,n,r){var v=document.getElementById('gi'+n).value;var c=a.substr(
if ($poolinputs === true)
echo "function cbs(s){var t=s.replace(/\\\\/g,'\\\\\\\\'); return t.replace(/,/g, '\\\\,')}\nfunction pla(r){var u=document.getElementById('purl').value;var w=document.getElementById('pwork').value;var p=document.getElementById('ppass').value;pr('&rig='+r+'&arg=addpool|'+cbs(u)+','+cbs(w)+','+cbs(p),'Add Pool '+u)}\nfunction psp(r){var p=document.getElementById('prio').value;pr('&rig='+r+'&arg=poolpriority|'+p,'Set Pool Priorities to '+p)}\n";
}
+echo "</script>\n";
+}
?>
-</script>
<table width=100% height=100% border=0 cellpadding=0 cellspacing=0 summary='Mine'>
<tr><td align=center valign=top>
<table border=0 cellpadding=4 cellspacing=0 summary='Mine'>
@@ -578,6 +590,14 @@ function classlastshare($when, $alldata, $warnclass, $errorclass)
return '';
}
#
+function endzero($num)
+{
+ $rep = preg_replace('/0*$/', '', $num);
+ if ($rep === '')
+ $rep = '0';
+ return $rep;
+}
+#
function fmt($section, $name, $value, $when, $alldata)
{
global $dfmt, $rownum;
@@ -840,12 +860,16 @@ function fmt($section, $name, $value, $when, $alldata)
case 'total.Diff1 Work':
case 'STATS.Times Sent':
case 'STATS.Bytes Sent':
+ case 'STATS.Net Bytes Sent':
case 'STATS.Times Recv':
case 'STATS.Bytes Recv':
+ case 'STATS.Net Bytes Recv':
case 'total.Times Sent':
case 'total.Bytes Sent':
+ case 'total.Net Bytes Sent':
case 'total.Times Recv':
case 'total.Bytes Recv':
+ case 'total.Net Bytes Recv':
$parts = explode('.', $value, 2);
if (count($parts) == 1)
$dec = '';
@@ -853,6 +877,23 @@ function fmt($section, $name, $value, $when, $alldata)
$dec = '.'.$parts[1];
$ret = number_format((float)$parts[0]).$dec;
break;
+ case 'STATS.Hs':
+ case 'STATS.W':
+ case 'STATS.history_time':
+ case 'STATS.Pool Wait':
+ case 'STATS.Pool Max':
+ case 'STATS.Pool Min':
+ case 'STATS.Pool Av':
+ case 'STATS.Min Diff':
+ case 'STATS.Max Diff':
+ case 'STATS.Work Diff':
+ $parts = explode('.', $value, 2);
+ if (count($parts) == 1)
+ $dec = '';
+ else
+ $dec = '.'.endzero($parts[1]);
+ $ret = number_format((float)$parts[0]).$dec;
+ break;
case 'GPU.Status':
case 'PGA.Status':
case 'DEVS.Status':
@@ -1507,7 +1548,6 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
#
function refreshbuttons()
{
- global $readonly;
global $ignorerefresh, $changerefresh, $autorefresh;
if ($ignorerefresh == false && $changerefresh == true)
@@ -1521,7 +1561,7 @@ function refreshbuttons()
#
function pagebuttons($rig, $pg)
{
- global $readonly, $rigs;
+ global $readonly, $rigs, $userlist, $ses;
global $allowcustompages, $customsummarypages;
if ($rig === null)
@@ -1557,18 +1597,33 @@ function pagebuttons($rig, $pg)
}
echo '<tr><td><table cellpadding=0 cellspacing=0 border=0><tr><td nowrap>';
- if ($prev !== null)
- echo riginput($prev, 'Prev').' ';
- echo "<input type=button value='Refresh' onclick='pr(\"$refresh\",null)'> ";
- if ($next !== null)
- echo riginput($next, 'Next').' ';
- echo ' ';
- if (count($rigs) > 1)
- echo "<input type=button value='Summary' onclick='pr(\"\",null)'> ";
+ if ($userlist === null || isset($_SESSION[$ses]))
+ {
+ if ($prev !== null)
+ echo riginput($prev, 'Prev').' ';
+ echo "<input type=button value='Refresh' onclick='pr(\"$refresh\",null)'> ";
+ if ($next !== null)
+ echo riginput($next, 'Next').' ';
+ echo ' ';
+ if (count($rigs) > 1)
+ echo "<input type=button value='Summary' onclick='pr(\"\",null)'> ";
+ }
if ($allowcustompages === true)
- foreach ($customsummarypages as $pagename => $data)
+ {
+ if ($userlist === null || isset($_SESSION[$ses]))
+ $list = $customsummarypages;
+ else
+ {
+ if ($userlist !== null && isset($userlist['def']))
+ $list = array_flip($userlist['def']);
+ else
+ $list = array();
+ }
+
+ foreach ($list as $pagename => $data)
echo "<input type=button value='$pagename' onclick='pr(\"&pg=$pagename\",null)'> ";
+ }
echo '</td><td width=100%> </td><td nowrap>';
if ($rig !== null && $readonly === false)
@@ -1580,6 +1635,12 @@ function pagebuttons($rig, $pg)
echo " <input type=button value='Quit' onclick='prc(\"quit&rig=$rig\",\"Quit CGMiner$rg\")'>";
}
refreshbuttons();
+ if (isset($_SESSION[$ses]))
+ echo " <input type=button value='Logout' onclick='pr(\"&logout=1\",null)'>";
+ else
+ if ($userlist !== null)
+ echo " <input type=button value='Login' onclick='pr(\"&login=1\",null)'>";
+
echo "</td></tr></table></td></tr>";
}
#
@@ -2410,13 +2471,126 @@ function showcustompage($pagename)
pagebuttons(null, $pagename);
}
#
+function onlylogin()
+{
+ global $here;
+
+ htmlhead(false, null, null, true);
+
+?>
+<tr height=15%><td> </td></tr>
+<tr><td>
+ <center>
+ <table width=384 height=368 cellpadding=0 cellspacing=0 border=0>
+ <tr><td>
+ <table width=100% height=100% border=0 align=center cellpadding=5 cellspacing=0>
+ <tr><td><form action='<?php echo $here; ?>' method=post>
+ <table width=200 border=0 align=center cellpadding=5 cellspacing=0>
+ <tr><td height=120 colspan=2> </td></tr>
+ <tr><td colspan=2 align=center valign=middle>
+ <h2>LOGIN</h2></td></tr>
+ <tr><td align=center valign=middle><div align=right>Username:</div></td>
+ <td height=33 align=center valign=middle>
+ <input type=text name=rut size=18></td></tr>
+ <tr><td align=center valign=middle><div align=right>Password:</div></td>
+ <td height=33 align=center valign=middle>
+ <input type=password name=roh size=18></td></tr>
+ <tr valign=top><td></td><td><input type=submit value=Login>
+ </td></tr>
+ </table></form></td></tr>
+ </table></td></tr>
+ </table></center>
+</td></tr>
+<?php
+}
+#
+function checklogin()
+{
+ global $allowcustompages, $customsummarypages;
+ global $readonly, $userlist, $ses;
+
+ $out = trim(getparam('logout', true));
+ if ($out !== null && $out !== '' && isset($_SESSION[$ses]))
+ unset($_SESSION[$ses]);
+
+ $login = trim(getparam('login', true));
+ if ($login !== null && $login !== '')
+ {
+ if (isset($_SESSION[$ses]))
+ unset($_SESSION[$ses]);
+
+ onlylogin();
+ return 'login';
+ }
+
+ if ($userlist === null)
+ return false;
+
+ $rut = trim(getparam('rut', true));
+ $roh = trim(getparam('roh', true));
+
+ if (($rut !== null && $rut !== '') || ($roh !== null && $roh !== ''))
+ {
+ if (isset($_SESSION[$ses]))
+ unset($_SESSION[$ses]);
+
+ if ($rut !== null && $rut !== '' && $roh !== null && $roh !== '')
+ {
+ if (isset($userlist['sys']) && isset($userlist['sys'][$rut])
+ && ($userlist['sys'][$rut] === $roh))
+ {
+ $_SESSION[$ses] = true;
+ return false;
+ }
+
+ if (isset($userlist['usr']) && isset($userlist['usr'][$rut])
+ && ($userlist['usr'][$rut] === $roh))
+ {
+ $_SESSION[$ses] = false;
+ $readonly = true;
+ return false;
+ }
+ }
+ }
+
+ if (isset($_SESSION[$ses]))
+ {
+ if ($_SESSION[$ses] == false)
+ $readonly = true;
+ return false;
+ }
+
+ if (isset($userlist['def']) && $allowcustompages === true)
+ {
+ // Ensure at least one exists
+ foreach ($userlist['def'] as $pg)
+ if (isset($customsummarypages[$pg]))
+ return true;
+ }
+
+ onlylogin();
+ return 'login';
+}
+#
function display()
{
global $miner, $port;
global $readonly, $notify, $rigs;
global $ignorerefresh, $autorefresh;
- global $allowcustompages;
+ global $allowcustompages, $customsummarypages;
global $placebuttons;
+ global $userlist, $ses;
+
+ $pagesonly = checklogin();
+
+ if ($pagesonly === 'login')
+ return;
+
+ if ($rigs == null or count($rigs) == 0)
+ {
+ otherrow("<td>No rigs defined</td>");
+ return;
+ }
if ($ignorerefresh == false)
{
@@ -2425,52 +2599,65 @@ function display()
$autorefresh = intval($ref);
}
- $rig = trim(getparam('rig', true));
-
- $arg = trim(getparam('arg', true));
- $preprocess = null;
- if ($arg != null and $arg != '')
+ if ($pagesonly !== true)
{
- $num = null;
- if ($rig != null and $rig != '')
- {
- if ($rig >= 0 and $rig < count($rigs))
- $num = $rig;
- }
- else
- if (count($rigs) == 0)
- $num = 0;
+ $rig = trim(getparam('rig', true));
- if ($num != null)
+ $arg = trim(getparam('arg', true));
+ $preprocess = null;
+ if ($arg != null and $arg != '')
{
- $parts = explode(':', $rigs[$num], 3);
- if (count($parts) >= 2)
+ if ($rig != null and $rig != '' and $rig >= 0 and $rig < count($rigs))
{
- $miner = $parts[0];
- $port = $parts[1];
+ $parts = explode(':', $rigs[$rig], 3);
+ if (count($parts) >= 2)
+ {
+ $miner = $parts[0];
+ $port = $parts[1];
- if ($readonly !== true)
- $preprocess = $arg;
+ if ($readonly !== true)
+ $preprocess = $arg;
+ }
}
}
}
- if ($rigs == null or count($rigs) == 0)
- {
- otherrow("<td>No rigs defined</td>");
- return;
- }
-
if ($allowcustompages === true)
{
$pg = trim(getparam('pg', true));
- if ($pg != null && $pg != '')
+ if ($pagesonly === true)
+ {
+ if ($pg !== null && $pg !== '')
+ {
+ if ($userlist !== null && isset($userlist['def'])
+ && !in_array($pg, $userlist['def']))
+ $pg = null;
+ }
+ else
+ {
+ if ($userlist !== null && isset($userlist['def']))
+ foreach ($userlist['def'] as $pglook)
+ if (isset($customsummarypages[$pglook]))
+ {
+ $pg = $pglook;
+ break;
+ }
+ }
+ }
+
+ if ($pg !== null && $pg !== '')
{
showcustompage($pg);
return;
}
}
+ if ($pagesonly === true)
+ {
+ onlylogin();
+ return;
+ }
+
if (count($rigs) == 1)
{
$parts = explode(':', $rigs[0], 3);
diff --git a/usbutils.c b/usbutils.c
index ad3ff27..a34028e 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Andrew Smith
+ * Copyright 2012-2013 Andrew Smith
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -16,6 +16,10 @@
#include "miner.h"
#include "usbutils.h"
+#define NODEV(err) ((err) == LIBUSB_ERROR_NO_DEVICE || \
+ (err) == LIBUSB_ERROR_PIPE || \
+ (err) == LIBUSB_ERROR_OTHER)
+
#ifdef USE_ICARUS
#define DRV_ICARUS 1
#endif
@@ -36,11 +40,21 @@
#define EPO(x) (LIBUSB_ENDPOINT_OUT | (unsigned char)(x))
#ifdef WIN32
+#define BITFORCE_TIMEOUT_MS 500
#define MODMINER_TIMEOUT_MS 200
#else
+#define BITFORCE_TIMEOUT_MS 200
#define MODMINER_TIMEOUT_MS 100
#endif
+#ifdef USE_BITFORCE
+// N.B. transfer size is 512 with USB2.0, but only 64 with USB1.1
+static struct usb_endpoints bfl_eps[] = {
+ { LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(1), 0 },
+ { LIBUSB_TRANSFER_TYPE_BULK, 64, EPO(2), 0 }
+};
+#endif
+
#ifdef USE_MODMINER
static struct usb_endpoints mmq_eps[] = {
{ LIBUSB_TRANSFER_TYPE_BULK, 64, EPI(3), 0 },
@@ -48,7 +62,7 @@ static struct usb_endpoints mmq_eps[] = {
};
#endif
-// TODO: Add support for (at least) Interrupt endpoints
+// TODO: Add support for (at least) Isochronous endpoints
static struct usb_find_devices find_dev[] = {
/*
#ifdef USE_ICARUS
@@ -56,55 +70,52 @@ static struct usb_find_devices find_dev[] = {
{ DRV_ICARUS, "LOT", 0x0403, 0x6001, false, EPI(0), EPO(0), 1 },
{ DRV_ICARUS, "CM1", 0x067b, 0x0230, false, EPI(0), EPO(0), 1 },
#endif
+*/
#ifdef USE_BITFORCE
- { DRV_BITFORCE, "BFL", 0x0403, 0x6014, true, EPI(1), EPO(2), 1 },
+ {
+ .drv = DRV_BITFORCE,
+ .name = "BFL",
+ .idVendor = 0x0403,
+ .idProduct = 0x6014,
+ .kernel = 0,
+ .config = 1,
+ .interface = 0,
+ .timeout = BITFORCE_TIMEOUT_MS,
+ .epcount = ARRAY_SIZE(bfl_eps),
+ .eps = bfl_eps },
#endif
-*/
#ifdef USE_MODMINER
{
.drv = DRV_MODMINER,
.name = "MMQ",
.idVendor = 0x1fc9,
.idProduct = 0x0003,
+ .kernel = 0,
.config = 1,
.interface = 1,
.timeout = MODMINER_TIMEOUT_MS,
.epcount = ARRAY_SIZE(mmq_eps),
.eps = mmq_eps },
#endif
- { DRV_LAST, NULL, 0, 0, 0, 0, 0, 0, NULL }
+ { DRV_LAST, NULL, 0, 0, 0, 0, 0, 0, 0, NULL }
};
#ifdef USE_BITFORCE
-extern struct device_api bitforce_api;
+extern struct device_drv bitforce_drv;
#endif
#ifdef USE_ICARUS
-extern struct device_api icarus_api;
+extern struct device_drv icarus_drv;
#endif
#ifdef USE_MODMINER
-extern struct device_api modminer_api;
+extern struct device_drv modminer_drv;
#endif
-/*
- * Our own internal list of used USB devices
- * So two drivers or a single driver searching
- * can't touch the same device during detection
- */
-struct usb_list {
- uint8_t bus_number;
- uint8_t device_address;
- uint8_t filler[2];
- struct usb_list *prev;
- struct usb_list *next;
-};
-
#define STRBUFLEN 256
static const char *BLANK = "";
-static pthread_mutex_t *list_lock = NULL;
-static struct usb_list *usb_head = NULL;
+static bool stats_initialised = false;
struct cg_usb_stats_item {
uint64_t count;
@@ -138,6 +149,7 @@ static int next_stat = 0;
static const char **usb_commands;
+static const char *C_REJECTED_S = "RejectedNoDevice";
static const char *C_PING_S = "Ping";
static const char *C_CLEAR_S = "Clear";
static const char *C_REQUESTVERSION_S = "RequestVersion";
@@ -160,6 +172,18 @@ static const char *C_SENDWORK_S = "SendWork";
static const char *C_SENDWORKSTATUS_S = "SendWorkStatus";
static const char *C_REQUESTWORKSTATUS_S = "RequestWorkStatus";
static const char *C_GETWORKSTATUS_S = "GetWorkStatus";
+static const char *C_REQUESTIDENTIFY_S = "RequestIdentify";
+static const char *C_GETIDENTIFY_S = "GetIdentify";
+static const char *C_REQUESTFLASH_S = "RequestFlash";
+static const char *C_REQUESTSENDWORK_S = "RequestSendWork";
+static const char *C_REQUESTSENDWORKSTATUS_S = "RequestSendWorkStatus";
+static const char *C_RESET_S = "Reset";
+static const char *C_SETBAUD_S = "SetBaud";
+static const char *C_SETDATA_S = "SetDataCtrl";
+static const char *C_SETFLOW_S = "SetFlowCtrl";
+static const char *C_SETMODEM_S = "SetModemCtrl";
+static const char *C_PURGERX_S = "PurgeRx";
+static const char *C_PURGETX_S = "PurgeTx";
#ifdef EOL
#undef EOL
@@ -501,10 +525,8 @@ static void cgusb_check_init()
{
mutex_lock(&cgusb_lock);
- if (list_lock == NULL) {
- list_lock = calloc(1, sizeof(*list_lock));
- mutex_init(list_lock);
-
+ if (stats_initialised == false) {
+ // N.B. environment LIBUSB_DEBUG also sets libusb_set_debug()
if (opt_usbdump >= 0) {
libusb_set_debug(NULL, opt_usbdump);
usb_all();
@@ -515,6 +537,7 @@ static void cgusb_check_init()
// use constants so the stat generation is very quick
// and the association between number and name can't
// be missalined easily
+ usb_commands[C_REJECTED] = C_REJECTED_S;
usb_commands[C_PING] = C_PING_S;
usb_commands[C_CLEAR] = C_CLEAR_S;
usb_commands[C_REQUESTVERSION] = C_REQUESTVERSION_S;
@@ -537,146 +560,264 @@ static void cgusb_check_init()
usb_commands[C_SENDWORKSTATUS] = C_SENDWORKSTATUS_S;
usb_commands[C_REQUESTWORKSTATUS] = C_REQUESTWORKSTATUS_S;
usb_commands[C_GETWORKSTATUS] = C_GETWORKSTATUS_S;
+ usb_commands[C_REQUESTIDENTIFY] = C_REQUESTIDENTIFY_S;
+ usb_commands[C_GETIDENTIFY] = C_GETIDENTIFY_S;
+ usb_commands[C_REQUESTFLASH] = C_REQUESTFLASH_S;
+ usb_commands[C_REQUESTSENDWORK] = C_REQUESTSENDWORK_S;
+ usb_commands[C_REQUESTSENDWORKSTATUS] = C_REQUESTSENDWORKSTATUS_S;
+ usb_commands[C_RESET] = C_RESET_S;
+ usb_commands[C_SETBAUD] = C_SETBAUD_S;
+ usb_commands[C_SETDATA] = C_SETDATA_S;
+ usb_commands[C_SETFLOW] = C_SETFLOW_S;
+ usb_commands[C_SETMODEM] = C_SETMODEM_S;
+ usb_commands[C_PURGERX] = C_PURGERX_S;
+ usb_commands[C_PURGETX] = C_PURGETX_S;
+
+ stats_initialised = true;
}
mutex_unlock(&cgusb_lock);
}
-static bool in_use(libusb_device *dev, bool lock)
-{
- struct usb_list *usb_tmp;
- bool used = false;
- uint8_t bus_number;
- uint8_t device_address;
-
- bus_number = libusb_get_bus_number(dev);
- device_address = libusb_get_device_address(dev);
-
- if (lock)
- mutex_lock(list_lock);
-
- if ((usb_tmp = usb_head))
- do {
- if (bus_number == usb_tmp->bus_number
- && device_address == usb_tmp->device_address) {
- used = true;
- break;
- }
-
- usb_tmp = usb_tmp->next;
-
- } while (usb_tmp != usb_head);
+#ifdef WIN32
+#else
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+union semun {
+ int sem;
+ struct semid_ds *seminfo;
+ ushort *all;
+};
+#endif
- if (lock)
- mutex_unlock(list_lock);
+// Any errors should always be printed since they will rarely if ever occur
+// and thus it is best to always display them
+static bool cgminer_usb_lock_bd(struct device_drv *drv, uint8_t bus_number, uint8_t device_address)
+{
+#ifdef WIN32
+ struct cgpu_info *cgpu;
+ HANDLE usbMutex;
+ char name[64];
+ DWORD res;
+ int i;
- return used;
-}
+ sprintf(name, "cgminer-usb-%d-%d", (int)bus_number, (int)device_address);
-static void add_used(libusb_device *dev, bool lock)
-{
- struct usb_list *usb_tmp;
- char buf[128];
- uint8_t bus_number;
- uint8_t device_address;
+ usbMutex = CreateMutex(NULL, FALSE, name);
+ if (usbMutex == NULL) {
+ applog(LOG_ERR,
+ "MTX: %s USB failed to get '%s' err (%d)",
+ drv->dname, name, GetLastError());
+ return false;
+ }
- bus_number = libusb_get_bus_number(dev);
- device_address = libusb_get_device_address(dev);
+ res = WaitForSingleObject(usbMutex, 0);
+ switch(res) {
+ case WAIT_OBJECT_0:
+ case WAIT_ABANDONED:
+ // Am I using it already?
+ for (i = 0; i < total_devices; i++) {
+ cgpu = devices[i];
+ if (cgpu->usbinfo.bus_number == bus_number &&
+ cgpu->usbinfo.device_address == device_address &&
+ cgpu->usbinfo.nodev == false) {
+ if (ReleaseMutex(usbMutex)) {
+ applog(LOG_WARNING,
+ "MTX: %s USB can't get '%s' - device in use",
+ drv->dname, name);
+ goto fail;
+ }
+ applog(LOG_ERR,
+ "MTX: %s USB can't get '%s' - device in use - failure (%d)",
+ drv->dname, name, GetLastError());
+ goto fail;
+ }
+ }
+ return true;
+ case WAIT_TIMEOUT:
+ applog(LOG_WARNING,
+ "MTX: %s USB failed to get '%s' - device in use",
+ drv->dname, name);
+ goto fail;
+ case WAIT_FAILED:
+ applog(LOG_ERR,
+ "MTX: %s USB failed to get '%s' err (%d)",
+ drv->dname, name, GetLastError());
+ goto fail;
+ default:
+ applog(LOG_ERR,
+ "MTX: %s USB failed to get '%s' unknown reply (%d)",
+ drv->dname, name, res);
+ goto fail;
+ }
- if (lock)
- mutex_lock(list_lock);
+ CloseHandle(usbMutex);
+ return true;
+fail:
+ CloseHandle(usbMutex);
+ return false;
+#else
+ struct semid_ds seminfo;
+ union semun opt;
+ char name[64];
+ key_t key;
+ int fd, sem, count;
+
+ sprintf(name, "/tmp/cgminer-usb-%d-%d", (int)bus_number, (int)device_address);
+ fd = open(name, O_CREAT|O_RDONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+ if (fd == -1) {
+ applog(LOG_ERR,
+ "SEM: %s USB open failed '%s' err (%d) %s",
+ drv->dname, name, errno, strerror(errno));
+ return false;
+ }
+ close(fd);
+ key = ftok(name, 'K');
+ sem = semget(key, 1, IPC_CREAT | IPC_EXCL | 438);
+ if (sem < 0) {
+ if (errno != EEXIST) {
+ applog(LOG_ERR,
+ "SEM: %s USB failed to get '%s' err (%d) %s",
+ drv->dname, name, errno, strerror(errno));
+ return false;
+ }
- if (in_use(dev, false)) {
- if (lock)
- mutex_unlock(list_lock);
+ sem = semget(key, 1, 0);
+ if (sem < 0) {
+ applog(LOG_ERR,
+ "SEM: %s USB failed to access '%s' err (%d) %s",
+ drv->dname, name, errno, strerror(errno));
+ return false;
+ }
- sprintf(buf, "add_used() duplicate bus_number %d device_address %d",
- bus_number, device_address);
- quit(1, buf);
+ opt.seminfo = &seminfo;
+ count = 0;
+ while (++count) {
+ // Should NEVER take 100ms
+ if (count > 99) {
+ applog(LOG_ERR,
+ "SEM: %s USB timeout waiting for (%d) '%s'",
+ drv->dname, sem, name);
+ return false;
+ }
+ if (semctl(sem, 0, IPC_STAT, opt) == -1) {
+ applog(LOG_ERR,
+ "SEM: %s USB failed to wait for (%d) '%s' count %d err (%d) %s",
+ drv->dname, sem, name, count, errno, strerror(errno));
+ return false;
+ }
+ if (opt.seminfo->sem_otime != 0)
+ break;
+ nmsleep(1);
+ }
}
- usb_tmp = malloc(sizeof(*usb_tmp));
-
- usb_tmp->bus_number = bus_number;
- usb_tmp->device_address = device_address;
-
- if (usb_head) {
- // add to end
- usb_tmp->prev = usb_head->prev;
- usb_tmp->next = usb_head;
- usb_head->prev = usb_tmp;
- usb_tmp->prev->next = usb_tmp;
- } else {
- usb_tmp->prev = usb_tmp;
- usb_tmp->next = usb_tmp;
- usb_head = usb_tmp;
+ struct sembuf sops[] = {
+ { 0, 0, IPC_NOWAIT | SEM_UNDO },
+ { 0, 1, IPC_NOWAIT | SEM_UNDO }
+ };
+
+ if (semop(sem, sops, 2)) {
+ if (errno == EAGAIN) {
+ applog(LOG_WARNING,
+ "SEM: %s USB failed to get (%d) '%s' - device in use",
+ drv->dname, sem, name);
+ } else {
+ applog(LOG_DEBUG,
+ "SEM: %s USB failed to get (%d) '%s' err (%d) %s",
+ drv->dname, sem, name, errno, strerror(errno));
+ }
+ return false;
}
- if (lock)
- mutex_unlock(list_lock);
+ return true;
+#endif
}
-static void release(uint8_t bus_number, uint8_t device_address, bool lock)
+static bool cgminer_usb_lock(struct device_drv *drv, libusb_device *dev)
{
- struct usb_list *usb_tmp;
- bool found = false;
- char buf[128];
-
- if (lock)
- mutex_lock(list_lock);
-
- usb_tmp = usb_head;
- if (usb_tmp)
- do {
- if (bus_number == usb_tmp->bus_number
- && device_address == usb_tmp->device_address) {
- found = true;
- break;
- }
-
- usb_tmp = usb_tmp->next;
+ return cgminer_usb_lock_bd(drv, libusb_get_bus_number(dev), libusb_get_device_address(dev));
+}
- } while (usb_tmp != usb_head);
+// Any errors should always be printed since they will rarely if ever occur
+// and thus it is best to always display them
+static void cgminer_usb_unlock_bd(struct device_drv *drv, uint8_t bus_number, uint8_t device_address)
+{
+#ifdef WIN32
+ HANDLE usbMutex;
+ char name[64];
- if (!found) {
- if (lock)
- mutex_unlock(list_lock);
+ sprintf(name, "cgminer-usb-%d-%d", (int)bus_number, (int)device_address);
- sprintf(buf, "release() unknown: bus_number %d device_address %d",
- bus_number, device_address);
- quit(1, buf);
+ usbMutex = CreateMutex(NULL, FALSE, name);
+ if (usbMutex == NULL) {
+ applog(LOG_ERR,
+ "MTX: %s USB failed to get '%s' for release err (%d)",
+ drv->dname, name, GetLastError());
+ return;
}
- if (usb_tmp->next == usb_tmp) {
- usb_head = NULL;
- } else {
- usb_tmp->next->prev = usb_tmp->prev;
- usb_tmp->prev->next = usb_tmp->next;
- }
+ if (!ReleaseMutex(usbMutex))
+ applog(LOG_ERR,
+ "MTX: %s USB failed to release '%s' err (%d)",
+ drv->dname, name, GetLastError());
- if (lock)
- mutex_unlock(list_lock);
+ CloseHandle(usbMutex);
+ return;
+#else
+ char name[64];
+ key_t key;
+ int fd, sem;
+
+ sprintf(name, "/tmp/cgminer-usb-%d-%d", (int)bus_number, (int)device_address);
+ fd = open(name, O_CREAT|O_RDONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+ if (fd == -1) {
+ applog(LOG_ERR,
+ "SEM: %s USB open failed '%s' for release err (%d) %s",
+ drv->dname, name, errno, strerror(errno));
+ return;
+ }
+ close(fd);
+ key = ftok(name, 'K');
+
+ sem = semget(key, 1, 0);
+ if (sem < 0) {
+ applog(LOG_ERR,
+ "SEM: %s USB failed to get '%s' for release err (%d) %s",
+ drv->dname, name, errno, strerror(errno));
+ return;
+ }
- free(usb_tmp);
-}
+ struct sembuf sops[] = {
+ { 0, -1, SEM_UNDO }
+ };
-static void release_dev(libusb_device *dev, bool lock)
-{
- uint8_t bus_number;
- uint8_t device_address;
+ // Allow a 10ms timeout
+ // exceeding this timeout means it would probably never succeed anyway
+ struct timespec timeout = { 0, 10000000 };
- bus_number = libusb_get_bus_number(dev);
- device_address = libusb_get_device_address(dev);
+ // Wait forever since we shoud be the one who has it
+ if (semtimedop(sem, sops, 1, &timeout)) {
+ applog(LOG_ERR,
+ "SEM: %d USB failed to release '%s' err (%d) %s",
+ drv->dname, name, errno, strerror(errno));
+ }
- release(bus_number, device_address, lock);
+ return;
+#endif
}
-#if 0
-static void release_cgusb(struct cg_usb_device *cgusb, bool lock)
+static void cgminer_usb_unlock(struct device_drv *drv, libusb_device *dev)
{
- release(cgusb->bus_number, cgusb->device_address, lock);
+ cgminer_usb_unlock_bd(drv, libusb_get_bus_number(dev), libusb_get_device_address(dev));
}
-#endif
static struct cg_usb_device *free_cgusb(struct cg_usb_device *cgusb)
{
@@ -691,6 +832,8 @@ static struct cg_usb_device *free_cgusb(struct cg_usb_device *cgusb)
free(cgusb->descriptor);
+ free(cgusb->found);
+
free(cgusb);
return NULL;
@@ -703,6 +846,31 @@ void usb_uninit(struct cgpu_info *cgpu)
cgpu->usbdev = free_cgusb(cgpu->usbdev);
}
+void release_cgpu(struct cgpu_info *cgpu)
+{
+ struct cg_usb_device *cgusb = cgpu->usbdev;
+ int i;
+
+ cgpu->usbinfo.nodev = true;
+ cgpu->usbinfo.nodev_count++;
+ gettimeofday(&(cgpu->usbinfo.last_nodev), NULL);
+
+ // 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++)
+ if (devices[i] != cgpu && devices[i]->usbdev == cgusb) {
+ devices[i]->usbinfo.nodev = true;
+ devices[i]->usbinfo.nodev_count++;
+ memcpy(&(devices[i]->usbinfo.last_nodev),
+ &(cgpu->usbinfo.last_nodev), sizeof(struct timeval));
+ devices[i]->usbdev = NULL;
+ }
+
+ usb_uninit(cgpu);
+
+ cgminer_usb_unlock_bd(cgpu->drv, cgpu->usbinfo.bus_number, cgpu->usbinfo.device_address);
+}
+
bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found)
{
struct cg_usb_device *cgusb = NULL;
@@ -710,19 +878,25 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
const struct libusb_interface_descriptor *idesc;
const struct libusb_endpoint_descriptor *epdesc;
unsigned char strbuf[STRBUFLEN+1];
+ char devstr[STRBUFLEN+1];
int err, i, j, k;
+ cgpu->usbinfo.bus_number = libusb_get_bus_number(dev);
+ cgpu->usbinfo.device_address = libusb_get_device_address(dev);
+
+ sprintf(devstr, "- %s device %d:%d", found->name,
+ cgpu->usbinfo.bus_number, cgpu->usbinfo.device_address);
+
cgusb = calloc(1, sizeof(*cgusb));
cgusb->found = found;
- cgusb->bus_number = libusb_get_bus_number(dev);
- cgusb->device_address = libusb_get_device_address(dev);
-
cgusb->descriptor = calloc(1, sizeof(*(cgusb->descriptor)));
err = libusb_get_device_descriptor(dev, cgusb->descriptor);
if (err) {
- applog(LOG_ERR, "USB init failed to get descriptor, err %d", err);
+ applog(LOG_DEBUG,
+ "USB init failed to get descriptor, err %d %s",
+ err, devstr);
goto dame;
}
@@ -730,50 +904,70 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
if (err) {
switch (err) {
case LIBUSB_ERROR_ACCESS:
- applog(LOG_ERR, "USB init open device failed, err %d, you dont have priviledge to access the device", err);
+ applog(LOG_ERR,
+ "USB init open device failed, err %d, "
+ "you dont have priviledge to access %s",
+ err, devstr);
break;
#ifdef WIN32
// Windows specific message
case LIBUSB_ERROR_NOT_SUPPORTED:
- applog(LOG_ERR, "USB init, open device failed, err %d, you need to install a Windows USB driver for the device", err);
+ applog(LOG_ERR,
+ "USB init, open device failed, err %d, "
+ "you need to install a Windows USB driver for %s",
+ err, devstr);
break;
#endif
default:
- applog(LOG_ERR, "USB init, open device failed, err %d", err);
+ applog(LOG_DEBUG,
+ "USB init, open failed, err %d %s",
+ err, devstr);
}
goto dame;
}
- if (libusb_kernel_driver_active(cgusb->handle, 0) == 1) {
- applog(LOG_WARNING, "USB init, kernel attached ...");
- if (libusb_detach_kernel_driver(cgusb->handle, 0) == 0)
- applog(LOG_WARNING, "USB init, kernel detached successfully");
- else
- applog(LOG_WARNING, "USB init, kernel detach failed :(");
+#ifndef WIN32
+ if (libusb_kernel_driver_active(cgusb->handle, found->kernel) == 1) {
+ applog(LOG_DEBUG, "USB init, kernel attached ... %s", devstr);
+ err = libusb_detach_kernel_driver(cgusb->handle, found->kernel);
+ if (err == 0) {
+ applog(LOG_DEBUG,
+ "USB init, kernel detached successfully %s",
+ devstr);
+ } else {
+ applog(LOG_WARNING,
+ "USB init, kernel detach failed, err %d in use? %s",
+ err, devstr);
+ goto cldame;
+ }
}
+#endif
err = libusb_set_configuration(cgusb->handle, found->config);
if (err) {
switch(err) {
case LIBUSB_ERROR_BUSY:
- applog(LOG_WARNING, "USB init, %s device %d:%d in use",
- found->name, cgusb->bus_number, cgusb->device_address);
+ applog(LOG_WARNING,
+ "USB init, set config %d in use %s",
+ found->config, devstr);
break;
default:
- applog(LOG_DEBUG, "USB init, failed to set config to %d, err %d",
- found->config, err);
+ applog(LOG_DEBUG,
+ "USB init, failed to set config to %d, err %d %s",
+ found->config, err, devstr);
}
goto cldame;
}
err = libusb_get_active_config_descriptor(dev, &config);
if (err) {
- applog(LOG_DEBUG, "USB init, failed to get config descriptor %d, err %d",
- found->config, err);
+ applog(LOG_DEBUG,
+ "USB init, failed to get config descriptor, err %d %s",
+ err, devstr);
goto cldame;
}
- if ((int)(config->bNumInterfaces) < found->interface)
+ if ((int)(config->bNumInterfaces) <= found->interface)
goto cldame;
for (i = 0; i < found->epcount; i++)
@@ -802,8 +996,17 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
err = libusb_claim_interface(cgusb->handle, found->interface);
if (err) {
- applog(LOG_DEBUG, "USB init, claim interface %d failed, err %d",
- found->interface, err);
+ switch(err) {
+ case LIBUSB_ERROR_BUSY:
+ applog(LOG_WARNING,
+ "USB init, claim interface %d in use %s",
+ found->interface, devstr);
+ break;
+ default:
+ applog(LOG_DEBUG,
+ "USB init, claim interface %d failed, err %d %s",
+ found->interface, err, devstr);
+ }
goto cldame;
}
@@ -837,12 +1040,23 @@ bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find
// cgusb->fwVersion <- for temp1/temp2 decision? or serial? (driver-modminer.c)
// cgusb->interfaceVersion
- applog(LOG_DEBUG, "USB init device bus_number=%d device_address=%d usbver=%04x prod='%s' manuf='%s' serial='%s'", (int)(cgusb->bus_number), (int)(cgusb->device_address), cgusb->usbver, cgusb->prod_string, cgusb->manuf_string, cgusb->serial_string);
+ applog(LOG_DEBUG,
+ "USB init %s usbver=%04x prod='%s' manuf='%s' serial='%s'",
+ devstr, cgusb->usbver, cgusb->prod_string,
+ cgusb->manuf_string, cgusb->serial_string);
cgpu->usbdev = cgusb;
libusb_free_config_descriptor(config);
+ // Allow a name change based on the idVendor+idProduct
+ // N.B. must be done before calling add_cgpu()
+ if (strcmp(cgpu->drv->name, found->name)) {
+ if (!cgpu->drv->copy)
+ cgpu->drv = copy_drv(cgpu->drv);
+ cgpu->drv->name = (char *)(found->name);
+ }
+
return true;
cldame:
@@ -859,7 +1073,7 @@ dame:
return false;
}
-static bool usb_check_device(struct device_api *api, struct libusb_device *dev, struct usb_find_devices *look)
+static bool usb_check_device(struct device_drv *drv, struct libusb_device *dev, struct usb_find_devices *look)
{
struct libusb_device_descriptor desc;
int err;
@@ -871,26 +1085,26 @@ static bool usb_check_device(struct device_api *api, struct libusb_device *dev,
}
if (desc.idVendor != look->idVendor || desc.idProduct != look->idProduct) {
- applog(LOG_DEBUG, "%s looking for %04x:%04x but found %04x:%04x instead",
- api->name, look->idVendor, look->idProduct, desc.idVendor, desc.idProduct);
+ applog(LOG_DEBUG, "%s looking for %s %04x:%04x but found %04x:%04x instead",
+ drv->name, look->name, look->idVendor, look->idProduct, desc.idVendor, desc.idProduct);
return false;
}
- applog(LOG_DEBUG, "%s looking for and found %04x:%04x",
- api->name, look->idVendor, look->idProduct);
+ applog(LOG_DEBUG, "%s looking for and found %s %04x:%04x",
+ drv->name, look->name, look->idVendor, look->idProduct);
return true;
}
-static struct usb_find_devices *usb_check_each(int drv, struct device_api *api, struct libusb_device *dev)
+static struct usb_find_devices *usb_check_each(int drvnum, struct device_drv *drv, struct libusb_device *dev)
{
struct usb_find_devices *found;
int i;
for (i = 0; find_dev[i].drv != DRV_LAST; i++)
- if (find_dev[i].drv == drv) {
- if (usb_check_device(api, dev, &(find_dev[i]))) {
+ if (find_dev[i].drv == drvnum) {
+ if (usb_check_device(drv, dev, &(find_dev[i]))) {
found = malloc(sizeof(*found));
memcpy(found, &(find_dev[i]), sizeof(*found));
return found;
@@ -900,27 +1114,27 @@ static struct usb_find_devices *usb_check_each(int drv, struct device_api *api,
return NULL;
}
-static struct usb_find_devices *usb_check(__maybe_unused struct device_api *api, __maybe_unused struct libusb_device *dev)
+static struct usb_find_devices *usb_check(__maybe_unused struct device_drv *drv, __maybe_unused struct libusb_device *dev)
{
#ifdef USE_BITFORCE
- if (api == &bitforce_api)
- return usb_check_each(DRV_BITFORCE, api, dev);
+ if (drv->drv == DRIVER_BITFORCE)
+ return usb_check_each(DRV_BITFORCE, drv, dev);
#endif
#ifdef USE_ICARUS
- if (api == &icarus_api)
- return usb_check_each(DRV_ICARUS, api, dev);
+ if (drv->drv == DRIVER_ICARUS)
+ return usb_check_each(DRV_ICARUS, drv, dev);
#endif
#ifdef USE_MODMINER
- if (api == &modminer_api)
- return usb_check_each(DRV_MODMINER, api, dev);
+ if (drv->drv == DRIVER_MODMINER)
+ return usb_check_each(DRV_MODMINER, drv, dev);
#endif
return NULL;
}
-void usb_detect(struct device_api *api, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *))
+void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *))
{
libusb_device **list;
ssize_t count, i;
@@ -938,21 +1152,14 @@ void usb_detect(struct device_api *api, bool (*device_detect)(struct libusb_devi
applog(LOG_DEBUG, "USB scan devices: found no devices");
for (i = 0; i < count; i++) {
- mutex_lock(list_lock);
-
- if (in_use(list[i], false))
- mutex_unlock(list_lock);
- else {
- add_used(list[i], false);
-
- mutex_unlock(list_lock);
-
- found = usb_check(api, list[i]);
- if (!found)
- release_dev(list[i], true);
- else
+ found = usb_check(drv, list[i]);
+ if (found != NULL) {
+ if (cgminer_usb_lock(drv, list[i]) == false)
+ free(found);
+ else {
if (!device_detect(list[i], found))
- release_dev(list[i], true);
+ cgminer_usb_unlock(drv, list[i]);
+ }
}
}
@@ -1055,10 +1262,10 @@ static void newstats(struct cgpu_info *cgpu)
{
int i;
- cgpu->usbstat = ++next_stat;
+ cgpu->usbinfo.usbstat = ++next_stat;
usb_stats = realloc(usb_stats, sizeof(*usb_stats) * next_stat);
- usb_stats[next_stat-1].name = cgpu->api->name;
+ usb_stats[next_stat-1].name = cgpu->drv->name;
usb_stats[next_stat-1].device_id = -1;
usb_stats[next_stat-1].details = calloc(1, sizeof(struct cg_usb_stats_details) * C_MAX * 2);
for (i = 1; i < C_MAX * 2; i += 2)
@@ -1069,11 +1276,11 @@ static void newstats(struct cgpu_info *cgpu)
void update_usb_stats(__maybe_unused struct cgpu_info *cgpu)
{
#if DO_USB_STATS
- if (cgpu->usbstat < 1)
+ if (cgpu->usbinfo.usbstat < 1)
newstats(cgpu);
// we don't know the device_id until after add_cgpu()
- usb_stats[cgpu->usbstat - 1].device_id = cgpu->device_id;
+ usb_stats[cgpu->usbinfo.usbstat - 1].device_id = cgpu->device_id;
#endif
}
@@ -1084,10 +1291,10 @@ static void stats(struct cgpu_info *cgpu, struct timeval *tv_start, struct timev
double diff;
int item;
- if (cgpu->usbstat < 1)
+ if (cgpu->usbinfo.usbstat < 1)
newstats(cgpu);
- details = &(usb_stats[cgpu->usbstat - 1].details[cmd * 2 + seq]);
+ details = &(usb_stats[cgpu->usbinfo.usbstat - 1].details[cmd * 2 + seq]);
diff = tdiff(tv_finish, tv_start);
@@ -1116,62 +1323,130 @@ static void stats(struct cgpu_info *cgpu, struct timeval *tv_start, struct timev
memcpy(&(details->item[item].last), tv_start, sizeof(tv_start));
details->item[item].count++;
}
+
+static void rejected_inc(struct cgpu_info *cgpu)
+{
+ struct cg_usb_stats_details *details;
+ int item = CMD_ERROR;
+
+ if (cgpu->usbinfo.usbstat < 1)
+ newstats(cgpu);
+
+ details = &(usb_stats[cgpu->usbinfo.usbstat - 1].details[C_REJECTED * 2 + 0]);
+
+ details->item[item].count++;
+}
#endif
-int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *processed, unsigned int timeout, int eol, enum usb_cmds cmd)
+int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *processed, unsigned int timeout, int eol, enum usb_cmds cmd, bool ftdi)
{
struct cg_usb_device *usbdev = cgpu->usbdev;
#if DO_USB_STATS
- struct timeval tv_start, tv_finish;
+ struct timeval tv_start;
#endif
- int err, got, tot;
+ struct timeval read_start, tv_finish;
+ unsigned int initial_timeout;
+ double max, done;
+ int err, got, tot, i;
bool first = true;
+ if (cgpu->usbinfo.nodev) {
+ *buf = '\0';
+ *processed = 0;
+#if DO_USB_STATS
+ rejected_inc(cgpu);
+#endif
+ return LIBUSB_ERROR_NO_DEVICE;
+ }
+
+ if (timeout == DEVTIMEOUT)
+ timeout = usbdev->found->timeout;
+
if (eol == -1) {
got = 0;
STATS_TIMEVAL(&tv_start);
err = libusb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep,
(unsigned char *)buf,
- bufsiz, &got,
- timeout == DEVTIMEOUT ? usbdev->found->timeout : timeout);
+ bufsiz, &got, timeout);
STATS_TIMEVAL(&tv_finish);
USB_STATS(cgpu, &tv_start, &tv_finish, err, cmd, SEQ0);
+ if (ftdi) {
+ // first 2 bytes returned are an FTDI status
+ if (got > 2) {
+ got -= 2;
+ memmove(buf, buf+2, got+1);
+ } else {
+ got = 0;
+ *buf = '\0';
+ }
+ }
+
*processed = got;
+ if (NODEV(err))
+ release_cgpu(cgpu);
+
return err;
}
tot = 0;
err = LIBUSB_SUCCESS;
+ initial_timeout = timeout;
+ max = ((double)timeout) / 1000.0;
+ gettimeofday(&read_start, NULL);
while (bufsiz) {
got = 0;
STATS_TIMEVAL(&tv_start);
err = libusb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep,
(unsigned char *)buf,
- 1, &got,
- timeout == DEVTIMEOUT ? usbdev->found->timeout : timeout);
- STATS_TIMEVAL(&tv_finish);
+ bufsiz, &got, timeout);
+ gettimeofday(&tv_finish, NULL);
USB_STATS(cgpu, &tv_start, &tv_finish, err, cmd, first ? SEQ0 : SEQ1);
+ if (ftdi) {
+ // first 2 bytes returned are an FTDI status
+ if (got > 2) {
+ got -= 2;
+ memmove(buf, buf+2, got+1);
+ } else {
+ got = 0;
+ *buf = '\0';
+ }
+ }
+
tot += got;
if (err)
break;
- if (eol == buf[0])
- break;
+ // WARNING - this will return data past EOL ('if' there is extra data)
+ for (i = 0; i < got; i++)
+ if (buf[i] == eol)
+ goto goteol;
buf += got;
bufsiz -= got;
first = false;
+
+ done = tdiff(&tv_finish, &read_start);
+ // N.B. this is return LIBUSB_SUCCESS with whatever size has already been read
+ if (unlikely(done >= max))
+ break;
+
+ timeout = initial_timeout - (done * 1000);
}
+goteol:
+
*processed = tot;
+ if (NODEV(err))
+ release_cgpu(cgpu);
+
return err;
}
@@ -1183,6 +1458,14 @@ int _usb_write(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pr
#endif
int err, sent;
+ if (cgpu->usbinfo.nodev) {
+ *processed = 0;
+#if DO_USB_STATS
+ rejected_inc(cgpu);
+#endif
+ return LIBUSB_ERROR_NO_DEVICE;
+ }
+
sent = 0;
STATS_TIMEVAL(&tv_start);
err = libusb_bulk_transfer(usbdev->handle,
@@ -1195,6 +1478,37 @@ int _usb_write(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pr
*processed = sent;
+ if (NODEV(err))
+ release_cgpu(cgpu);
+
+ return err;
+}
+
+int _usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned int timeout, enum usb_cmds cmd)
+{
+ struct cg_usb_device *usbdev = cgpu->usbdev;
+#if DO_USB_STATS
+ struct timeval tv_start, tv_finish;
+#endif
+ int err;
+
+ if (cgpu->usbinfo.nodev) {
+#if DO_USB_STATS
+ rejected_inc(cgpu);
+#endif
+ return LIBUSB_ERROR_NO_DEVICE;
+ }
+
+ STATS_TIMEVAL(&tv_start);
+ err = libusb_control_transfer(usbdev->handle, request_type,
+ bRequest, wValue, wIndex, NULL, 0,
+ timeout == DEVTIMEOUT ? usbdev->found->timeout : timeout);
+ STATS_TIMEVAL(&tv_finish);
+ USB_STATS(cgpu, &tv_start, &tv_finish, err, cmd, SEQ0);
+
+ if (NODEV(err))
+ release_cgpu(cgpu);
+
return err;
}
diff --git a/usbutils.h b/usbutils.h
index 71fd969..ac6ce0c 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Andrew Smith
+ * Copyright 2012-2013 Andrew Smith
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -12,6 +12,29 @@
#include <libusb.h>
+// for 0x0403/0x6014 FT232H (and possibly others?)
+#define FTDI_TYPE_OUT (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_OUT)
+
+#define FTDI_REQUEST_RESET ((uint8_t)0)
+#define FTDI_REQUEST_MODEM ((uint8_t)1)
+#define FTDI_REQUEST_FLOW ((uint8_t)2)
+#define FTDI_REQUEST_BAUD ((uint8_t)3)
+#define FTDI_REQUEST_DATA ((uint8_t)4)
+
+#define FTDI_VALUE_RESET 0
+#define FTDI_VALUE_PURGE_RX 1
+#define FTDI_VALUE_PURGE_TX 2
+
+// baud with a 0 divisor is 120,000,000/10
+//#define FTDI_VALUE_BAUD (0)
+//#define FTDI_INDEX_BAUD (0)
+#define FTDI_VALUE_BAUD 0xc068
+#define FTDI_INDEX_BAUD 0x0200
+
+#define FTDI_VALUE_DATA 0
+#define FTDI_VALUE_FLOW 0
+#define FTDI_VALUE_MODEM 0x0303
+
// Use the device defined timeout
#define DEVTIMEOUT 0
@@ -32,6 +55,7 @@ struct usb_find_devices {
const char *name;
uint16_t idVendor;
uint16_t idProduct;
+ int kernel;
int config;
int interface;
unsigned int timeout;
@@ -44,8 +68,6 @@ struct cg_usb_device {
libusb_device_handle *handle;
pthread_mutex_t *mutex;
struct libusb_device_descriptor *descriptor;
- uint8_t bus_number;
- uint8_t device_address;
uint16_t usbver;
int speed;
char *prod_string;
@@ -55,8 +77,18 @@ struct cg_usb_device {
unsigned char interfaceVersion; // ??
};
+struct cg_usb_info {
+ uint8_t bus_number;
+ uint8_t device_address;
+ int usbstat;
+ bool nodev;
+ int nodev_count;
+ struct timeval last_nodev;
+};
+
enum usb_cmds {
- C_PING = 0,
+ C_REJECTED = 0,
+ C_PING,
C_CLEAR,
C_REQUESTVERSION,
C_GETVERSION,
@@ -78,32 +110,49 @@ enum usb_cmds {
C_SENDWORKSTATUS,
C_REQUESTWORKSTATUS,
C_GETWORKSTATUS,
+ C_REQUESTIDENTIFY,
+ C_GETIDENTIFY,
+ C_REQUESTFLASH,
+ C_REQUESTSENDWORK,
+ C_REQUESTSENDWORKSTATUS,
+ C_RESET,
+ C_SETBAUD,
+ C_SETDATA,
+ C_SETFLOW,
+ C_SETMODEM,
+ C_PURGERX,
+ C_PURGETX,
C_MAX
};
-struct device_api;
+struct device_drv;
struct cgpu_info;
void usb_uninit(struct cgpu_info *cgpu);
+void release_cgpu(struct cgpu_info *cgpu);
bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found);
-void usb_detect(struct device_api *api, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *));
+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, int eol, enum usb_cmds);
+int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *processed, unsigned int timeout, int eol, enum usb_cmds, bool ftdi);
int _usb_write(struct cgpu_info *cgpu, int ep, 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, unsigned int timeout, enum usb_cmds cmd);
void usb_cleanup();
#define usb_read(cgpu, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, -1, cmd)
+ _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, -1, cmd, false)
+
+#define usb_read_nl(cgpu, buf, bufsiz, read, cmd) \
+ _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, '\n', cmd, false)
#define usb_read_ep(cgpu, ep, buf, bufsiz, read, cmd) \
- _usb_read(cgpu, ep, buf, bufsiz, read, DEVTIMEOUT, -1, cmd)
+ _usb_read(cgpu, ep, buf, bufsiz, read, DEVTIMEOUT, -1, cmd, false)
#define usb_read_timeout(cgpu, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, timeout, -1, cmd)
+ _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, timeout, -1, cmd, false)
#define usb_read_ep_timeout(cgpu, ep, buf, bufsiz, read, timeout, cmd) \
- _usb_read(cgpu, ep, buf, bufsiz, read, timeout, -1, cmd)
+ _usb_read(cgpu, ep, buf, bufsiz, read, timeout, -1, cmd, false)
#define usb_write(cgpu, buf, bufsiz, wrote, cmd) \
_usb_write(cgpu, DEFAULT_EP_OUT, buf, bufsiz, wrote, DEVTIMEOUT, cmd)
@@ -117,4 +166,10 @@ void usb_cleanup();
#define usb_write_ep_timeout(cgpu, ep, buf, bufsiz, wrote, timeout, cmd) \
_usb_write(cgpu, ep, buf, bufsiz, wrote, timeout, cmd)
+#define usb_ftdi_read_nl(cgpu, buf, bufsiz, read, cmd) \
+ _usb_read(cgpu, DEFAULT_EP_IN, buf, bufsiz, read, DEVTIMEOUT, '\n', cmd, true)
+
+#define usb_transfer(cgpu, typ, req, val, idx, cmd) \
+ _usb_transfer(cgpu, typ, req, val, idx, DEVTIMEOUT, cmd)
+
#endif
diff --git a/util.c b/util.c
index e628af4..9283955 100644
--- a/util.c
+++ b/util.c
@@ -261,6 +261,30 @@ static void set_nettime(void)
wr_unlock(&netacc_lock);
}
+static int curl_debug_cb(__maybe_unused CURL *handle, curl_infotype type,
+ __maybe_unused unsigned char *data, size_t size,
+ void *userdata)
+{
+ struct pool *pool = (struct pool *)userdata;
+
+ switch(type) {
+ case CURLINFO_HEADER_IN:
+ case CURLINFO_DATA_IN:
+ case CURLINFO_SSL_DATA_IN:
+ pool->cgminer_pool_stats.net_bytes_received += size;
+ break;
+ case CURLINFO_HEADER_OUT:
+ case CURLINFO_DATA_OUT:
+ case CURLINFO_SSL_DATA_OUT:
+ pool->cgminer_pool_stats.net_bytes_sent += size;
+ break;
+ case CURLINFO_TEXT:
+ default:
+ break;
+ }
+ return 0;
+}
+
json_t *json_rpc_call(CURL *curl, const char *url,
const char *userpass, const char *rpc_req,
bool probe, bool longpoll, int *rolltime,
@@ -287,10 +311,11 @@ json_t *json_rpc_call(CURL *curl, const char *url,
probing = !pool->probed;
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
-#if 0 /* Disable curl debugging since it spews to stderr */
- if (opt_protocol)
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-#endif
+ // CURLOPT_VERBOSE won't write to stderr if we use CURLOPT_DEBUGFUNCTION
+ curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, curl_debug_cb);
+ curl_easy_setopt(curl, CURLOPT_DEBUGDATA, (void *)pool);
+ curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_ENCODING, "");
@@ -912,6 +937,7 @@ static bool __stratum_send(struct pool *pool, char *s, ssize_t len)
pool->cgminer_pool_stats.times_sent++;
pool->cgminer_pool_stats.bytes_sent += ssent;
+ pool->cgminer_pool_stats.net_bytes_sent += ssent;
return true;
}
@@ -1041,6 +1067,7 @@ char *recv_line(struct pool *pool)
pool->cgminer_pool_stats.times_received++;
pool->cgminer_pool_stats.bytes_received += len;
+ pool->cgminer_pool_stats.net_bytes_received += len;
out:
if (!sret)
clear_sock(pool);