Commit 78a32f2ebc6c4a3160bf67e2a4b2404032fd76d6
2012-04-22T10:54:26
Style police on driver-ztex.c
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
diff --git a/driver-ztex.c b/driver-ztex.c
index f9bbf33..03b409f 100644
--- a/driver-ztex.c
+++ b/driver-ztex.c
@@ -33,10 +33,10 @@
struct device_api ztex_api, ztex_hotplug_api;
// Forward declarations
-static void ztex_disable (struct thr_info* thr);
+static void ztex_disable(struct thr_info* thr);
static bool ztex_prepare(struct thr_info *thr);
-static void ztex_detect()
+static void ztex_detect(void)
{
int cnt;
int i;
@@ -45,7 +45,7 @@ static void ztex_detect()
cnt = libztex_scanDevices(&ztex_devices);
applog(LOG_WARNING, "Found %d ztex board(s)", cnt);
- for (i=0; i<cnt; i++) {
+ for (i = 0; i < cnt; i++) {
if (total_devices == MAX_DEVICES)
break;
struct cgpu_info *ztex;
@@ -62,25 +62,25 @@ static void ztex_detect()
libztex_freeDevList(ztex_devices);
}
-static bool ztex_updateFreq (struct libztex_device* ztex)
+static bool ztex_updateFreq(struct libztex_device* ztex)
{
int i, maxM, bestM;
double bestR, r;
- for (i=0; i<ztex->freqMaxM; i++)
- if (ztex->maxErrorRate[i+1]*i < ztex->maxErrorRate[i]*(i+20))
- ztex->maxErrorRate[i+1] = ztex->maxErrorRate[i]*(1.0+20.0/i);
+ for (i = 0; i < ztex->freqMaxM; i++)
+ if (ztex->maxErrorRate[i + 1] * i < ztex->maxErrorRate[i] * (i + 20))
+ ztex->maxErrorRate[i + 1] = ztex->maxErrorRate[i] * (1.0 + 20.0 / i);
maxM = 0;
- while (maxM<ztex->freqMDefault && ztex->maxErrorRate[maxM+1]<LIBZTEX_MAXMAXERRORRATE)
+ while (maxM < ztex->freqMDefault && ztex->maxErrorRate[maxM + 1] < LIBZTEX_MAXMAXERRORRATE)
maxM++;
- while (maxM<ztex->freqMaxM && ztex->errorWeight[maxM]>150 && ztex->maxErrorRate[maxM+1]<LIBZTEX_MAXMAXERRORRATE)
+ while (maxM < ztex->freqMaxM && ztex->errorWeight[maxM] > 150 && ztex->maxErrorRate[maxM + 1] < LIBZTEX_MAXMAXERRORRATE)
maxM++;
bestM = 0;
bestR = 0;
- for (i=0; i<=maxM; i++) {
- r = (i + 1 + ( i == ztex->freqM ? LIBZTEX_ERRORHYSTERESIS : 0))*(1-ztex->maxErrorRate[i]);
+ for (i = 0; i <= maxM; i++) {
+ r = (i + 1 + (i == ztex->freqM? LIBZTEX_ERRORHYSTERESIS: 0)) * (1 - ztex->maxErrorRate[i]);
if (r > bestR) {
bestM = i;
bestR = r;
@@ -91,20 +91,21 @@ static bool ztex_updateFreq (struct libztex_device* ztex)
libztex_setFreq(ztex, bestM);
maxM = ztex->freqMDefault;
- while (maxM<ztex->freqMaxM && ztex->errorWeight[maxM+1] > 100)
+ while (maxM < ztex->freqMaxM && ztex->errorWeight[maxM + 1] > 100)
maxM++;
- if ((bestM < (1.0-LIBZTEX_OVERHEATTHRESHOLD) * maxM) && bestM < maxM - 1) {
+ if ((bestM < (1.0 - LIBZTEX_OVERHEATTHRESHOLD) * maxM) && bestM < maxM - 1) {
libztex_resetFpga(ztex);
- applog(LOG_ERR, "%s: frequency drop of %.1f%% detect. This may be caused by overheating. FPGA is shut down to prevent damage.", ztex->repr, (1.0-1.0*bestM/maxM)*100);
+ applog(LOG_ERR, "%s: frequency drop of %.1f%% detect. This may be caused by overheating. FPGA is shut down to prevent damage.",
+ ztex->repr, (1.0 - 1.0 * bestM / maxM) * 100);
return false;
}
return true;
}
-static bool ztex_checkNonce (struct libztex_device *ztex,
- struct work *work,
- struct libztex_hash_data *hdata)
+static bool ztex_checkNonce(struct libztex_device *ztex,
+ struct work *work,
+ struct libztex_hash_data *hdata)
{
uint32_t *data32 = (uint32_t *)(work->data);
unsigned char swap[128];
@@ -134,7 +135,7 @@ static bool ztex_checkNonce (struct libztex_device *ztex,
#else
if (swab32(hash2_32[7]) != ((hdata->hash7 + 0x5be0cd19) & 0xFFFFFFFF)) {
#endif
- ztex->errorCount[ztex->freqM] += 1.0/ztex->numNonces;
+ ztex->errorCount[ztex->freqM] += 1.0 / ztex->numNonces;
applog(LOG_DEBUG, "%s: checkNonce failed for %0.8X", ztex->repr, hdata->nonce);
return false;
}
@@ -156,7 +157,7 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
ztex = thr->cgpu->device_ztex;
memcpy(sendbuf, work->data + 64, 12);
- memcpy(sendbuf+12, work->midstate, 32);
+ memcpy(sendbuf + 12, work->midstate, 32);
memset(backlog, 0, sizeof(backlog));
i = libztex_sendHashData(ztex, sendbuf);
if (i < 0) {
@@ -174,7 +175,7 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
applog(LOG_DEBUG, "sent hashdata");
- for (i=0; i<ztex->numNonces; i++)
+ for (i = 0; i < ztex->numNonces; i++)
lastnonce[i] = 0;
overflow = false;
@@ -207,7 +208,7 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
ztex->errorCount[ztex->freqM] *= 0.995;
ztex->errorWeight[ztex->freqM] = ztex->errorWeight[ztex->freqM] * 0.995 + 1.0;
- for (i=0; i<ztex->numNonces; i++) {
+ for (i = 0; i < ztex->numNonces; i++) {
nonce = hdata[i].nonce;
#if defined(__BIGENDIAN__) || defined(MIPSEB)
nonce = swab32(nonce);
@@ -217,9 +218,8 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
if (((nonce & 0x7fffffff) >> 4) < ((lastnonce[i] & 0x7fffffff) >> 4)) {
applog(LOG_DEBUG, "%s: overflow nonce=%0.8x lastnonce=%0.8x", ztex->repr, nonce, lastnonce[i]);
overflow = true;
- } else {
+ } else
lastnonce[i] = nonce;
- }
#if !(defined(__BIGENDIAN__) || defined(MIPSEB))
nonce = swab32(nonce);
#endif
@@ -230,7 +230,7 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
nonce = hdata[i].goldenNonce;
if (nonce > 0) {
found = false;
- for (j=0; j<GOLDEN_BACKLOG; j++) {
+ for (j = 0; j < GOLDEN_BACKLOG; j++) {
if (backlog[j] == nonce) {
found = true;
break;
@@ -254,7 +254,7 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
}
- ztex->errorRate[ztex->freqM] = ztex->errorCount[ztex->freqM] / ztex->errorWeight[ztex->freqM] * (ztex->errorWeight[ztex->freqM]<100 ? ztex->errorWeight[ztex->freqM]*0.01 : 1.0);
+ ztex->errorRate[ztex->freqM] = ztex->errorCount[ztex->freqM] / ztex->errorWeight[ztex->freqM] * (ztex->errorWeight[ztex->freqM] < 100? ztex->errorWeight[ztex->freqM] * 0.01: 1.0);
if (ztex->errorRate[ztex->freqM] > ztex->maxErrorRate[ztex->freqM])
ztex->maxErrorRate[ztex->freqM] = ztex->errorRate[ztex->freqM];
@@ -266,7 +266,7 @@ static uint64_t ztex_scanhash(struct thr_info *thr, struct work *work,
work->blk.nonce = 0xffffffff;
- return noncecnt > 0 ? noncecnt : 1;
+ return noncecnt > 0? noncecnt: 1;
}
static void ztex_statline_before(char *buf, struct cgpu_info *cgpu)
@@ -304,7 +304,7 @@ static void ztex_shutdown(struct thr_info *thr)
}
}
-static void ztex_disable (struct thr_info *thr)
+static void ztex_disable(struct thr_info *thr)
{
applog(LOG_ERR, "%s: Disabling!", thr->cgpu->device_ztex->repr);
devices[thr->cgpu->device_id]->deven = DEV_DISABLED;
@@ -320,4 +320,3 @@ struct device_api ztex_api = {
.scanhash = ztex_scanhash,
.thread_shutdown = ztex_shutdown,
};
-