thodg/cgminer

diff --git a/libztex.c b/libztex.c
index 28716d6..c6bd6aa 100644
--- a/libztex.c
+++ b/libztex.c
@@ -44,10 +44,11 @@
 
 
 
-static bool libztex_checkDevice (struct libusb_device *dev) {
+static bool libztex_checkDevice(struct libusb_device *dev)
+{
+	struct libusb_device_descriptor desc;
 	int err;
 
-	struct libusb_device_descriptor desc;
 	err = libusb_get_device_descriptor(dev, &desc);
 	if (unlikely(err != 0)) {
 		applog(LOG_ERR, "Ztex check device: Failed to open read descriptor with error %d", err);
@@ -60,30 +61,34 @@ static bool libztex_checkDevice (struct libusb_device *dev) {
 	return true;
 }
 
-static bool libztex_checkCapability (struct libztex_device *ztex, int i, int j) {
-	if (!((i>=0) && (i<=5) && (j>=0) && (j<8) &&
+static bool libztex_checkCapability(struct libztex_device *ztex, int i, int j)
+{
+	if (!((i >= 0) && (i <= 5) && (j >= 0) && (j < 8) &&
 	     (((ztex->interfaceCapabilities[i] & 255) & (1 << j)) != 0)))
 		applog(LOG_ERR, "%s: capability missing: %d %d", ztex->repr, i, i);
 	return true;
 }
 
-static int libztex_detectBitstreamBitOrder (const unsigned char *buf, int size) {
+static int libztex_detectBitstreamBitOrder(const unsigned char *buf, int size)
+{
 	int i;
-	size -= 4;
-	for (i=0; i<size; i++) {
-		if ( ((buf[i] & 255)==0xaa) && ((buf[i+1] & 255)==0x99) && ((buf[i+2] & 255)==0x55) && ((buf[i+3] & 255)==0x66) )
+
+	for (i = 0; i < size - 4; i++) {
+		if (((buf[i] & 255) == 0xaa) && ((buf[i + 1] & 255) == 0x99) && ((buf[i + 2] & 255) == 0x55) && ((buf[i + 3] & 255) == 0x66))
 			return 1;
-		if ( ((buf[i] & 255)==0x55) && ((buf[i+1] & 255)==0x99) && ((buf[i+2] & 255)==0xaa) && ((buf[i+3] & 255)==0x66) )
+		if (((buf[i] & 255) == 0x55) && ((buf[i + 1] & 255) == 0x99) && ((buf[i + 2] & 255) == 0xaa) && ((buf[i + 3] & 255) == 0x66))
 			return 0;
 	} 
 	applog(LOG_WARNING, "Unable to determine bitstream bit order: no signature found");
 	return 0;
 }
 
-static void libztex_swapBits (unsigned char *buf, int size) {
-	int i;
+static void libztex_swapBits(unsigned char *buf, int size)
+{
 	unsigned char c;
-	for (i=0; i<size; i++) {
+	int i;
+
+	for (i = 0; i < size; i++) {
 		c = buf[i];
 		buf[i] = ((c & 128) >> 7) |
 		         ((c & 64) >> 5) |
@@ -96,9 +101,11 @@ static void libztex_swapBits (unsigned char *buf, int size) {
 	}
 }
 
-static int libztex_getFpgaState (struct libztex_device *ztex, struct libztex_fpgastate *state) {
-	int cnt;
+static int libztex_getFpgaState(struct libztex_device *ztex, struct libztex_fpgastate *state)
+{
 	unsigned char buf[9];
+	int cnt;
+
 	if (!libztex_checkCapability(ztex, CAPABILITY_FPGA))
 		return -1;
 	cnt = libusb_control_transfer(ztex->hndl, 0xc0, 0x30, 0, 0, buf, 9, 1000);
@@ -108,19 +115,20 @@ static int libztex_getFpgaState (struct libztex_device *ztex, struct libztex_fpg
 	}
 	state->fpgaConfigured = (buf[0] == 0);
 	state->fpgaChecksum = buf[1] & 0xff;
-	state->fpgaBytes = ((buf[5] & 0xff)<<24) | ((buf[4] & 0xff)<<16) | ((buf[3] & 0xff)<<8) | (buf[2] & 0xff);
+	state->fpgaBytes = ((buf[5] & 0xff) << 24) | ((buf[4] & 0xff) << 16) | ((buf[3] & 0xff) << 8) | (buf[2] & 0xff);
 	state->fpgaInitB = buf[6] & 0xff;
 	state->fpgaFlashResult = buf[7];
 	state->fpgaFlashBitSwap = (buf[8] != 0);
 	return 0;
 }
 
-static int libztex_configureFpgaLS (struct libztex_device *ztex, const char* firmware, bool force, char bs) {
+static int libztex_configureFpgaLS(struct libztex_device *ztex, const char* firmware, bool force, char bs)
+{
 	struct libztex_fpgastate state;
-	ssize_t pos=0;
-	int transactionBytes = 2048;
+	const int transactionBytes = 2048;
 	unsigned char buf[transactionBytes], cs;
 	int tries, cnt, buf_p, i;
+	ssize_t pos = 0;
 	FILE *fp;
 
 	if (!libztex_checkCapability(ztex, CAPABILITY_FPGA))
@@ -132,8 +140,7 @@ static int libztex_configureFpgaLS (struct libztex_device *ztex, const char* fir
 		return 1;
 	}
 
-	for (tries=10; tries>0; tries--) {
-
+	for (tries = 10; tries > 0; tries--) {
 		fp = fopen(firmware, "rb");
 		if (!fp) {
 			applog(LOG_ERR, "%s: failed to read firmware '%s'", ztex->repr, firmware);
@@ -144,12 +151,13 @@ static int libztex_configureFpgaLS (struct libztex_device *ztex, const char* fir
 		while (pos < transactionBytes && !feof(fp)) {
 			buf[pos] = getc(fp);
 			cs += buf[pos++];
-		};
+		}
+
 		if (feof(fp))
 			pos--;
 
-		if ( bs != 0 && bs != 1 )
-			bs = libztex_detectBitstreamBitOrder(buf, transactionBytes<pos ? transactionBytes : pos);
+		if (bs != 0 && bs != 1)
+			bs = libztex_detectBitstreamBitOrder(buf, transactionBytes < pos? transactionBytes: pos);
 
 		//* Reset fpga
 		cnt = libztex_resetFpga(ztex);
@@ -158,14 +166,14 @@ static int libztex_configureFpgaLS (struct libztex_device *ztex, const char* fir
 			continue;
 		}
 
-		if ( bs == 1 )
+		if (bs == 1)
 			libztex_swapBits(buf, pos);
 	 
 		buf_p = pos;
 		while (1) {
 			i = 0;
 			while (i < buf_p) {
-				cnt = libusb_control_transfer(ztex->hndl, 0x40, 0x32, 0, 0, &buf[i], buf_p-i, 5000);
+				cnt = libusb_control_transfer(ztex->hndl, 0x40, 0x32, 0, 0, &buf[i], buf_p - i, 5000);
 				if (unlikely(cnt < 0)) {
 					applog(LOG_ERR, "%s: Failed send fpga data with err %d", ztex->repr, cnt);
 					break;
@@ -178,13 +186,13 @@ static int libztex_configureFpgaLS (struct libztex_device *ztex, const char* fir
 			while (buf_p < transactionBytes && !feof(fp)) {
 				buf[buf_p] = getc(fp);
 				cs += buf[buf_p++];
-			};
+			}
 			if (feof(fp))
 				buf_p--;
 			pos += buf_p;
 			if (buf_p == 0)
 				break;
-			if ( bs == 1 )
+			if (bs == 1)
 				libztex_swapBits(buf, buf_p);
 		}
 		if (cnt >= 0)
@@ -202,19 +210,21 @@ static int libztex_configureFpgaLS (struct libztex_device *ztex, const char* fir
 	return 0;
 }
 
-int libztex_configureFpga (struct libztex_device *ztex) {
-	int rv;
+int libztex_configureFpga(struct libztex_device *ztex)
+{
 	char buf[256] = "bitstreams/";
+
 	memset(&buf[11], 0, 245);
 	strcpy(&buf[11], ztex->bitFileName);
 	strcpy(&buf[strlen(buf)], ".bit");
 
-	rv = libztex_configureFpgaLS(ztex, buf, true, 2);
-	return rv;
+	return libztex_configureFpgaLS(ztex, buf, true, 2);
 }
 
-int libztex_setFreq (struct libztex_device *ztex, uint16_t freq) {
+int libztex_setFreq(struct libztex_device *ztex, uint16_t freq)
+{
 	int cnt;
+
 	if (freq > ztex->freqMaxM)
 		freq = ztex->freqMaxM;
 
@@ -229,19 +239,21 @@ int libztex_setFreq (struct libztex_device *ztex, uint16_t freq) {
 	return 0;
 }
 
-int libztex_resetFpga (struct libztex_device *ztex) {
+int libztex_resetFpga(struct libztex_device *ztex)
+{
 	return libusb_control_transfer(ztex->hndl, 0x40, 0x31, 0, 0, NULL, 0, 1000);
 }
 
-int libztex_prepare_device (struct libusb_device *dev, struct libztex_device** ztex) {
+int libztex_prepare_device(struct libusb_device *dev, struct libztex_device** ztex)
+{
 	struct libztex_device *newdev;
-	int cnt, err;
 	unsigned char buf[64];
+	int cnt, err;
 
 	newdev = malloc(sizeof(struct libztex_device));
+	newdev->bitFileName = NULL;
 	newdev->valid = false;
 	newdev->hndl = NULL;
-	newdev->bitFileName = NULL;
 	*ztex = newdev;
 
 	err = libusb_get_device_descriptor(dev, &newdev->descriptor);
@@ -264,7 +276,7 @@ int libztex_prepare_device (struct libusb_device *dev, struct libztex_device** z
 	}
 
 	cnt = libusb_get_string_descriptor_ascii (newdev->hndl, newdev->descriptor.iSerialNumber, newdev->snString,
-	                                          LIBZTEX_SNSTRING_LEN+1);
+	                                          LIBZTEX_SNSTRING_LEN + 1);
 	if (unlikely(cnt < 0)) {
 		applog(LOG_ERR, "Ztex check device: Failed to read device snString with err %d", cnt);
 		return cnt;
@@ -276,7 +288,7 @@ int libztex_prepare_device (struct libusb_device *dev, struct libztex_device** z
 		return cnt;
 	}
 	
-	if ( buf[0]!=40 || buf[1]!=1 || buf[2]!='Z' || buf[3]!='T' || buf[4]!='E' || buf[5]!='X' ) {
+	if ( buf[0] != 40 || buf[1] != 1 || buf[2] != 'Z' || buf[3] != 'T' || buf[4] != 'E' || buf[5] != 'X' ) {
 		applog(LOG_ERR, "Ztex check device: Error reading ztex descriptor");
 		return 2;
 	}
@@ -323,21 +335,21 @@ int libztex_prepare_device (struct libusb_device *dev, struct libztex_device** z
 
 	newdev->numNonces = buf[1] + 1;
 	newdev->offsNonces = ((buf[2] & 255) | ((buf[3] & 255) << 8)) - 10000;
-	newdev->freqM1 = ( (buf[4] & 255) | ((buf[5] & 255) << 8) ) * 0.01;
+	newdev->freqM1 = ((buf[4] & 255) | ((buf[5] & 255) << 8) ) * 0.01;
 	newdev->freqMaxM = (buf[7] & 255);
 	newdev->freqM = (buf[6] & 255);
 	newdev->freqMDefault = newdev->freqM;
 
-	for (cnt=0; cnt<255; cnt++) {
+	for (cnt=0; cnt < 255; cnt++) {
 		newdev->errorCount[cnt] = 0;
 		newdev->errorWeight[cnt] = 0;
 		newdev->errorRate[cnt] = 0;
 		newdev->maxErrorRate[cnt] = 0;
 	}
 
-	cnt = strlen((char *)&buf[buf[0]==4?10:8]);
-	newdev->bitFileName = malloc(sizeof(char)*(cnt+1));
-	memcpy(newdev->bitFileName, &buf[buf[0]==4?10:8], cnt+1);	
+	cnt = strlen((char *)&buf[buf[0] == 4? 10: 8]);
+	newdev->bitFileName = malloc(sizeof(char) * (cnt + 1));
+	memcpy(newdev->bitFileName, &buf[buf[0] == 4? 10: 8], cnt + 1);
 
 	newdev->usbbus = libusb_get_bus_number(dev);
 	newdev->usbaddress = libusb_get_device_address(dev);
@@ -346,7 +358,8 @@ int libztex_prepare_device (struct libusb_device *dev, struct libztex_device** z
 	return 0;
 }
 
-void libztex_destroy_device (struct libztex_device* ztex) {
+void libztex_destroy_device(struct libztex_device* ztex)
+{
 	if (ztex->hndl != NULL) {
 		libusb_close(ztex->hndl);
 		ztex->hndl = NULL;
@@ -358,20 +371,21 @@ void libztex_destroy_device (struct libztex_device* ztex) {
 	free(ztex);
 }
 
-int libztex_scanDevices (struct libztex_dev_list*** devs_p) {
-	libusb_device **list;
+int libztex_scanDevices(struct libztex_dev_list*** devs_p)
+{
+	int usbdevices[LIBZTEX_MAX_DESCRIPTORS];
+	struct libztex_dev_list **devs;
 	struct libztex_device *ztex;
-	ssize_t cnt = libusb_get_device_list(NULL, &list);
-	ssize_t i = 0;
 	int found = 0, pos = 0, err;
-	
+	libusb_device **list;
+	ssize_t cnt, i = 0;
+
+	cnt = libusb_get_device_list(NULL, &list);
 	if (unlikely(cnt < 0)) {
 		applog(LOG_ERR, "Ztex scan devices: Failed to list usb devices with err %d", cnt);
 		return 0;
 	}
 
-	int usbdevices[LIBZTEX_MAX_DESCRIPTORS];
-
 	for (i = 0; i < cnt; i++) {
 		if (libztex_checkDevice(list[i])) {
 			// Got one!
@@ -380,7 +394,6 @@ int libztex_scanDevices (struct libztex_dev_list*** devs_p) {
 		}
 	}
 
-	struct libztex_dev_list **devs;
 	devs = malloc(sizeof(struct libztex_dev_list *) * found);
 	if (devs == NULL) {
 		applog(LOG_ERR, "Ztex scan devices: Failed to allocate memory");
@@ -400,7 +413,7 @@ int libztex_scanDevices (struct libztex_dev_list*** devs_p) {
 		devs[pos]->dev = ztex;
 		devs[pos]->next = NULL;
 		if (pos > 0)
-			devs[pos-1]->next = devs[pos];
+			devs[pos - 1]->next = devs[pos];
 		pos++;
 	}
 
@@ -409,8 +422,10 @@ int libztex_scanDevices (struct libztex_dev_list*** devs_p) {
 	return pos;
 }
 
-int libztex_sendHashData (struct libztex_device *ztex, unsigned char *sendbuf) {
+int libztex_sendHashData(struct libztex_device *ztex, unsigned char *sendbuf)
+{
 	int cnt;
+
 	if (ztex == NULL || ztex->hndl == NULL)
 		return 0;
 	cnt = libusb_control_transfer(ztex->hndl, 0x40, 0x80, 0, 0, sendbuf, 44, 1000);
@@ -420,34 +435,37 @@ int libztex_sendHashData (struct libztex_device *ztex, unsigned char *sendbuf) {
 	return cnt;
 }
 
-int libztex_readHashData (struct libztex_device *ztex, struct libztex_hash_data nonces[]) {
+int libztex_readHashData(struct libztex_device *ztex, struct libztex_hash_data nonces[])
+{
 	// length of buf must be 8 * (numNonces + 1)
-	unsigned char rbuf[12*8];
+	unsigned char rbuf[12 * 8];
 	int cnt, i;
 
 	if (ztex->hndl == NULL)
 		return 0;
 	
-	cnt = libusb_control_transfer(ztex->hndl, 0xc0, 0x81, 0, 0, rbuf, 12*ztex->numNonces, 1000);
+	cnt = libusb_control_transfer(ztex->hndl, 0xc0, 0x81, 0, 0, rbuf, 12 * ztex->numNonces, 1000);
 	if (unlikely(cnt < 0)) {
 		applog(LOG_ERR, "%s: Failed readHashData with err %d", ztex->repr, cnt);
 		return cnt;
 	}
 
-	for (i=0; i<ztex->numNonces; i++) {
-		memcpy((char*)&nonces[i].goldenNonce, &rbuf[i*12], 4);
+	for (i = 0; i < ztex->numNonces; i++) {
+		memcpy((char*)&nonces[i].goldenNonce, &rbuf[i * 12], 4);
 		nonces[i].goldenNonce -= ztex->offsNonces;
-		memcpy((char*)&nonces[i].nonce, &rbuf[(i*12)+4], 4);
+		memcpy((char*)&nonces[i].nonce, &rbuf[(i * 12) + 4], 4);
 		nonces[i].nonce -= ztex->offsNonces;
-		memcpy((char*)&nonces[i].hash7, &rbuf[(i*12)+8], 4);
+		memcpy((char*)&nonces[i].hash7, &rbuf[(i * 12) + 8], 4);
 	}
 	
 	return cnt;
 }
 
-void libztex_freeDevList (struct libztex_dev_list **devs) {
-	ssize_t cnt = 0;
+void libztex_freeDevList(struct libztex_dev_list **devs)
+{
 	bool done = false;
+	ssize_t cnt = 0;
+
 	while (!done) {
 		if (devs[cnt]->next == NULL)
 			done = true;
@@ -455,5 +473,3 @@ void libztex_freeDevList (struct libztex_dev_list **devs) {
 	}
 	free(devs);
 }
-
-