X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Flwla.c;h=dd36f87fc33c9b6f96a6b88b338b97304a5ca113;hb=deb7615262ac4f9cc0750a08351afa7cbf9c34d5;hp=c884885cd918127e416fa84d84856807b2908046;hpb=407b6e2cff817c6b05f1f038e2fecd94ad11fa86;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/lwla.c b/src/hardware/sysclk-lwla/lwla.c
index c884885c..dd36f87f 100644
--- a/src/hardware/sysclk-lwla/lwla.c
+++ b/src/hardware/sysclk-lwla/lwla.c
@@ -24,8 +24,8 @@
 #include "lwla.h"
 #include "protocol.h"
 
-#define BITSTREAM_MAX_SIZE    (256 * 1024) /* bitstream size limit for safety */
-#define BITSTREAM_HEADER_SIZE 4            /* transfer header size in bytes */
+#define BITSTREAM_MAX_SIZE    (256 * 1024) /* Bitstream size limit for safety */
+#define BITSTREAM_HEADER_SIZE 4            /* Transfer header size in bytes */
 
 /* Load a bitstream file into memory. Returns a newly allocated array
  * consisting of a 32-bit length field followed by the bitstream data.
@@ -81,9 +81,7 @@ SR_PRIV int lwla_send_bitstream(struct sr_context *ctx,
 				const char *name)
 {
 	unsigned char *stream;
-	int ret;
-	int length;
-	int xfer_len;
+	int ret, length, xfer_len;
 
 	if (!ctx || !usb || !name)
 		return SR_ERR_BUG;
@@ -120,8 +118,7 @@ SR_PRIV int lwla_send_bitstream(struct sr_context *ctx,
 SR_PRIV int lwla_send_command(const struct sr_usb_dev_inst *usb,
 			      const uint16_t *command, int cmd_len)
 {
-	int ret;
-	int xfer_len;
+	int ret, xfer_len;
 
 	if (!usb || !command || cmd_len <= 0)
 		return SR_ERR_BUG;
@@ -140,55 +137,54 @@ SR_PRIV int lwla_send_command(const struct sr_usb_dev_inst *usb,
 		       LWLA_TO_UINT16(command[0]), xfer_len, cmd_len * 2);
 		return SR_ERR;
 	}
+
 	return SR_OK;
 }
 
 SR_PRIV int lwla_receive_reply(const struct sr_usb_dev_inst *usb,
-			       uint32_t *reply, int reply_len, int expect_len)
+			       void *reply, int buf_size, int *xfer_len)
 {
 	int ret;
-	int xfer_len;
 
-	if (!usb || !reply || reply_len <= 0)
+	if (!usb || !reply || buf_size <= 0)
 		return SR_ERR_BUG;
 
-	xfer_len = 0;
-	ret = libusb_bulk_transfer(usb->devhdl, EP_REPLY,
-				   (unsigned char *)reply, reply_len * 4,
-				   &xfer_len, USB_TIMEOUT_MS);
+	ret = libusb_bulk_transfer(usb->devhdl, EP_REPLY, reply, buf_size,
+				   xfer_len, USB_TIMEOUT_MS);
 	if (ret != 0) {
 		sr_dbg("Failed to receive reply: %s.", libusb_error_name(ret));
 		return SR_ERR;
 	}
-	if (xfer_len != expect_len * 4) {
-		sr_dbg("Failed to receive reply: incorrect length %d != %d.",
-		       xfer_len, expect_len * 4);
-		return SR_ERR;
-	}
+
 	return SR_OK;
 }
 
 SR_PRIV int lwla_read_reg(const struct sr_usb_dev_inst *usb,
 			  uint16_t reg, uint32_t *value)
 {
-	int ret;
+	int xfer_len, ret;
 	uint16_t command[2];
-	uint32_t reply[128]; /* full EP buffer to avoid overflows */
+	uint32_t reply[128]; /* Full EP buffer to avoid overflows. */
 
 	command[0] = LWLA_WORD(CMD_READ_REG);
 	command[1] = LWLA_WORD(reg);
 
-	ret = lwla_send_command(usb, command, ARRAY_SIZE(command));
-
+	ret = lwla_send_command(usb, ARRAY_AND_SIZE(command));
 	if (ret != SR_OK)
 		return ret;
 
-	ret = lwla_receive_reply(usb, reply, ARRAY_SIZE(reply), 1);
+	ret = lwla_receive_reply(usb, reply, sizeof(reply), &xfer_len);
+	if (ret != SR_OK)
+		return ret;
 
-	if (ret == SR_OK)
-		*value = LWLA_TO_UINT32(reply[0]);
+	if (xfer_len != 4) {
+		sr_dbg("Invalid register read response of length %d.",
+		       xfer_len);
+		return SR_ERR;
+	}
+	*value = LWLA_TO_UINT32(reply[0]);
 
-	return ret;
+	return SR_OK;
 }
 
 SR_PRIV int lwla_write_reg(const struct sr_usb_dev_inst *usb,
@@ -201,18 +197,17 @@ SR_PRIV int lwla_write_reg(const struct sr_usb_dev_inst *usb,
 	command[2] = LWLA_WORD_0(value);
 	command[3] = LWLA_WORD_1(value);
 
-	return lwla_send_command(usb, command, ARRAY_SIZE(command));
+	return lwla_send_command(usb, ARRAY_AND_SIZE(command));
 }
 
 SR_PRIV int lwla_write_regs(const struct sr_usb_dev_inst *usb,
 			    const struct regval *regvals, int count)
 {
-	int i;
-	int ret;
+	int i, ret;
 
 	ret = SR_OK;
 
-	for (i = 0; i < count; ++i) {
+	for (i = 0; i < count; i++) {
 		ret = lwla_write_reg(usb, regvals[i].reg, regvals[i].val);
 
 		if (ret != SR_OK)