X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Flwla1016.c;h=d16a35e71175a2c8f58f18a5bf8d180921d1a442;hb=276d7b18bbe71d061544c2d2989330b38ce86df3;hp=61435553951ccf9285712df6c76672da5dcc72b6;hpb=e35a4592488d7492a46921dd8bd130eae5faf11a;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/lwla1016.c b/src/hardware/sysclk-lwla/lwla1016.c
index 61435553..d16a35e7 100644
--- a/src/hardware/sysclk-lwla/lwla1016.c
+++ b/src/hardware/sysclk-lwla/lwla1016.c
@@ -121,7 +121,7 @@ static void read_response(struct acquisition_state *acq)
 	 * alignment is guaranteed.
 	 */
 	out_p = (uint32_t *)&acq->out_packet[acq->out_index * UNIT_SIZE];
-	in_p  = &acq->xfer_buf_in[acq->in_index];
+	in_p = &acq->xfer_buf_in[acq->in_index];
 	/*
 	 * Transfer two samples at a time, taking care to swap the 16-bit
 	 * halves of each input word but keeping the samples themselves in
@@ -142,9 +142,7 @@ static void read_response_rle(struct acquisition_state *acq)
 {
 	uint32_t *in_p;
 	uint16_t *out_p;
-	unsigned int words_left;
-	unsigned int max_samples, run_samples;
-	unsigned int wi, ri;
+	unsigned int words_left, max_samples, run_samples, wi, ri;
 	uint32_t word;
 	uint16_t sample;
 
@@ -170,14 +168,15 @@ static void read_response_rle(struct acquisition_state *acq)
 		acq->samples_done += run_samples;
 
 		if (run_samples == max_samples)
-			break; /* packet full or sample limit reached */
+			break; /* Packet full or sample limit reached. */
 		if (wi >= words_left)
-			break; /* done with current transfer */
+			break; /* Done with current transfer. */
 
 		word = GUINT32_FROM_LE(in_p[wi]);
 		acq->sample = word >> 16;
 		acq->run_len = (word & 0xFFFF) + 1;
 	}
+
 	acq->in_index += wi;
 	acq->mem_addr_done += wi;
 }
@@ -197,13 +196,12 @@ static int test_read_memory(const struct sr_dev_inst *sdi,
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
 	unsigned int i;
-	int xfer_len;
-	int ret;
+	int xfer_len, ret;
 	uint16_t command[5];
 	unsigned char reply[512];
 
 	devc = sdi->priv;
-	usb  = sdi->conn;
+	usb = sdi->conn;
 
 	command[0] = LWLA_WORD(CMD_READ_MEM32);
 	command[1] = LWLA_WORD_0(start);
@@ -231,6 +229,7 @@ static int test_read_memory(const struct sr_dev_inst *sdi,
 		       xfer_len);
 		return SR_ERR;
 	}
+
 	return SR_OK;
 }
 
@@ -240,19 +239,18 @@ static int apply_fpga_config(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct drv_context *drvc;
-	int config;
-	int ret;
+	int config, ret;
 
 	devc = sdi->priv;
 	drvc = sdi->driver->context;
 
 	if (sdi->status == SR_ST_INACTIVE)
-		return SR_OK; /* the LWLA1016 has no off state */
+		return SR_OK; /* The LWLA1016 has no off state. */
 
 	config = (devc->cfg_rle) ? FPGA_100_TS : FPGA_100;
 
 	if (config == devc->active_fpga_config)
-		return SR_OK; /* no change */
+		return SR_OK; /* No change. */
 
 	ret = lwla_send_bitstream(drvc->sr_ctx, sdi->conn,
 				  bitstream_map[config]);
@@ -271,7 +269,6 @@ static int device_init_check(const struct sr_dev_inst *sdi)
 	};
 	uint32_t value;
 	int ret;
-
 	const unsigned int test_count = 24;
 
 	lwla_read_reg(sdi->conn, REG_TEST_ID, &value);
@@ -293,6 +290,7 @@ static int device_init_check(const struct sr_dev_inst *sdi)
 	ret = test_read_memory(sdi, 0, test_count);
 	if (ret != SR_OK)
 		return ret;
+
 	/*
 	 * Issue another read request or the device will stall, for whatever
 	 * reason. This happens both with and without the short transfer quirk.
@@ -319,7 +317,7 @@ static int setup_acquisition(const struct sr_dev_inst *sdi)
 	int ret;
 
 	devc = sdi->priv;
-	usb  = sdi->conn;
+	usb = sdi->conn;
 
 	ret = lwla_write_reg(usb, REG_CHAN_MASK, devc->channel_mask);
 	if (ret != SR_OK)
@@ -351,7 +349,7 @@ static int prepare_request(const struct sr_dev_inst *sdi)
 	unsigned int chunk_len, count;
 
 	devc = sdi->priv;
-	acq  = devc->acquisition;
+	acq = devc->acquisition;
 
 	acq->xfer_out->length = 0;
 	acq->reg_seq_pos = 0;
@@ -411,7 +409,7 @@ static int handle_response(const struct sr_dev_inst *sdi)
 	int expect_len;
 
 	devc = sdi->priv;
-	acq  = devc->acquisition;
+	acq = devc->acquisition;
 
 	switch (devc->state) {
 	case STATE_STATUS_REQUEST: