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

Merge pull request #335 from denis2342/ztex

Browse Source 
ztex locking fix and cosmetic changes
This commit is contained in:
Con Kolivas 2012-12-02 01:41:21 -08:00
commit a6dce875de
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
driver-ztex.c
View File

@ -348,7 +348,7 @@ static void ztex_statline_before(char *buf, struct cgpu_info *cgpu)
{ {
if (cgpu->deven == DEV_ENABLED) { if (cgpu->deven == DEV_ENABLED) {
tailsprintf(buf, "%s-%d | ", cgpu->device_ztex->snString, cgpu->device_ztex->fpgaNum+1); tailsprintf(buf, "%s-%d | ", cgpu->device_ztex->snString, cgpu->device_ztex->fpgaNum+1);
tailsprintf(buf, "%0.2fMhz | ", cgpu->device_ztex->freqM1 * (cgpu->device_ztex->freqM + 1)); tailsprintf(buf, "%0.1fMHz | ", cgpu->device_ztex->freqM1 * (cgpu->device_ztex->freqM + 1));
} }
} }
@ -362,8 +362,11 @@ static bool ztex_prepare(struct thr_info *thr)
get_datestamp(cgpu->init, &now); get_datestamp(cgpu->init, &now);
ztex_selectFpga(ztex); ztex_selectFpga(ztex);
if (libztex_configureFpga(ztex) != 0) if (libztex_configureFpga(ztex) != 0) {
libztex_resetFpga(ztex);
ztex_releaseFpga(ztex);
return false; return false;
}
ztex_releaseFpga(ztex); ztex_releaseFpga(ztex);
ztex->freqM = ztex->freqMaxM+1;; ztex->freqM = ztex->freqMaxM+1;;
//ztex_updateFreq(ztex); //ztex_updateFreq(ztex);

12
libztex.c
View File

@ -306,11 +306,13 @@ static int libztex_configureFpgaLS(struct libztex_device *ztex, const char* firm
fclose(fp); fclose(fp);
} }
libztex_getFpgaState(ztex, &state); libztex_getFpgaState(ztex, &state);
if (!state.fpgaConfigured) { if (!state.fpgaConfigured) {
applog(LOG_ERR, "%s: FPGA configuration failed: DONE pin does not go high", ztex->repr); applog(LOG_ERR, "%s: LS FPGA configuration failed: DONE pin does not go high", ztex->repr);
return 3; return -3;
} }
nmsleep(200); nmsleep(200);
applog(LOG_INFO, "%s: FPGA configuration done", ztex->repr); applog(LOG_INFO, "%s: FPGA configuration done", ztex->repr);
return 0; return 0;
@ -383,10 +385,10 @@ int libztex_setFreq(struct libztex_device *ztex, uint16_t freq) {
} }
ztex->freqM = freq; ztex->freqM = freq;
if (oldfreq > ztex->freqMaxM) if (oldfreq > ztex->freqMaxM)
applog(LOG_WARNING, "%s: Frequency set to %0.2f Mhz", applog(LOG_WARNING, "%s: Frequency set to %0.1f MHz",
ztex->repr, ztex->freqM1 * (ztex->freqM + 1)); ztex->repr, ztex->freqM1 * (ztex->freqM + 1));
else else
applog(LOG_WARNING, "%s: Frequency change from %0.2f to %0.2f Mhz", applog(LOG_WARNING, "%s: Frequency change from %0.1f to %0.1f MHz",
ztex->repr, ztex->freqM1 * (oldfreq + 1), ztex->freqM1 * (ztex->freqM + 1)); ztex->repr, ztex->freqM1 * (oldfreq + 1), ztex->freqM1 * (ztex->freqM + 1));
return 0; return 0;
@ -466,7 +468,7 @@ int libztex_prepare_device(struct libusb_device *dev, struct libztex_device** zt
} }
/* num chars = (all bytes except bLength and bDescriptorType) / 2 */ /* num chars = (all bytes except bLength and bDescriptorType) / 2 */
for (i = 0; i <= (cnt - 2) / 2 && i < sizeof(newdev->snString)-1; i++) for (i = 0; i <= (cnt - 2) / 2 && i < (int)sizeof(newdev->snString)-1; i++)
newdev->snString[i] = buf[2 + i*2]; newdev->snString[i] = buf[2 + i*2];
newdev->snString[i] = 0; newdev->snString[i] = 0;