X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Fprotocol.c;h=5a1522fc9e60e50bfd050d0e15930c437a71788c;hb=3a322bbc3b0f4d79a79cffac00aeb05ff69ce535;hp=c00a92fd6919b42886b3842b8cd207c5b2fa324f;hpb=225d3cb0c52fc3df5b26fec94d3b3d2de796a41c;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/protocol.c b/src/hardware/sysclk-lwla/protocol.c
index c00a92fd..5a1522fc 100644
--- a/src/hardware/sysclk-lwla/protocol.c
+++ b/src/hardware/sysclk-lwla/protocol.c
@@ -305,7 +305,7 @@ static void process_capture_length(const struct sr_dev_inst *sdi)
 
 	sr_dbg("%zu words in capture buffer.", acq->mem_addr_fill);
 
-	if (acq->mem_addr_fill > 0 && sdi->status == SR_ST_ACTIVE)
+	if (acq->mem_addr_fill > 0 && !devc->cancel_requested)
 		issue_read_start(sdi);
 	else
 		issue_read_end(sdi);
@@ -327,16 +327,16 @@ static void issue_stop_capture(const struct sr_dev_inst *sdi)
 
 	regvals = devc->reg_write_seq;
 
-	regvals[0].reg = REG_CMD_CTRL2;
+	regvals[0].reg = REG_LONG_ADDR;
 	regvals[0].val = 10;
 
-	regvals[1].reg = REG_CMD_CTRL3;
+	regvals[1].reg = REG_LONG_LOW;
 	regvals[1].val = 0;
 
-	regvals[2].reg = REG_CMD_CTRL4;
+	regvals[2].reg = REG_LONG_HIGH;
 	regvals[2].val = 0;
 
-	regvals[3].reg = REG_CMD_CTRL1;
+	regvals[3].reg = REG_LONG_STROBE;
 	regvals[3].val = 0;
 
 	regvals[4].reg = REG_DIV_BYPASS;
@@ -599,8 +599,7 @@ static void end_acquisition(struct sr_dev_inst *sdi)
 
 	lwla_free_acquisition_state(devc->acquisition);
 	devc->acquisition = NULL;
-
-	sdi->status = SR_ST_ACTIVE;
+	devc->cancel_requested = FALSE;
 }
 
 /* USB output transfer completion callback.
@@ -631,7 +630,7 @@ static void LIBUSB_CALL receive_transfer_out(struct libusb_transfer *transfer)
 			submit_transfer(devc, devc->acquisition->xfer_in);
 			break;
 		case STATE_STOP_CAPTURE:
-			if (sdi->status == SR_ST_ACTIVE)
+			if (!devc->cancel_requested)
 				request_capture_length(sdi);
 			else
 				end_acquisition(sdi);
@@ -715,25 +714,25 @@ SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
 	if (ret != SR_OK)
 		return ret;
 
-	ret = lwla_write_reg(sdi->conn, REG_CMD_CTRL2, 100);
+	ret = lwla_write_reg(sdi->conn, REG_LONG_ADDR, 100);
 	if (ret != SR_OK)
 		return ret;
 
-	ret = lwla_read_reg(sdi->conn, REG_CMD_CTRL1, &value);
+	ret = lwla_read_reg(sdi->conn, REG_LONG_STROBE, &value);
 	if (ret != SR_OK)
 		return ret;
 	sr_dbg("Received test word 0x%08X back.", value);
 	if (value != 0x12345678)
 		return SR_ERR;
 
-	ret = lwla_read_reg(sdi->conn, REG_CMD_CTRL4, &value);
+	ret = lwla_read_reg(sdi->conn, REG_LONG_HIGH, &value);
 	if (ret != SR_OK)
 		return ret;
 	sr_dbg("Received test word 0x%08X back.", value);
 	if (value != 0x12345678)
 		return SR_ERR;
 
-	ret = lwla_read_reg(sdi->conn, REG_CMD_CTRL3, &value);
+	ret = lwla_read_reg(sdi->conn, REG_LONG_LOW, &value);
 	if (ret != SR_OK)
 		return ret;
 	sr_dbg("Received test word 0x%08X back.", value);
@@ -749,10 +748,12 @@ SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
 SR_PRIV int lwla_set_clock_config(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
+	struct drv_context *drvc;
 	int ret;
 	enum clock_config choice;
 
 	devc = sdi->priv;
+	drvc = sdi->driver->context;
 
 	if (sdi->status == SR_ST_INACTIVE)
 		choice = CONF_CLOCK_NONE;
@@ -765,7 +766,8 @@ SR_PRIV int lwla_set_clock_config(const struct sr_dev_inst *sdi)
 
 	if (choice != devc->cur_clock_config) {
 		devc->cur_clock_config = CONF_CLOCK_NONE;
-		ret = lwla_send_bitstream(sdi->conn, bitstream_map[choice]);
+		ret = lwla_send_bitstream(drvc->sr_ctx, sdi->conn,
+					  bitstream_map[choice]);
 		if (ret == SR_OK)
 			devc->cur_clock_config = choice;
 		return ret;
@@ -831,16 +833,16 @@ SR_PRIV int lwla_setup_acquisition(const struct sr_dev_inst *sdi)
 	regvals[1].reg = REG_MEM_CTRL2;
 	regvals[1].val = 1;
 
-	regvals[2].reg = REG_CMD_CTRL2;
+	regvals[2].reg = REG_LONG_ADDR;
 	regvals[2].val = 10;
 
-	regvals[3].reg = REG_CMD_CTRL3;
+	regvals[3].reg = REG_LONG_LOW;
 	regvals[3].val = 0x74;
 
-	regvals[4].reg = REG_CMD_CTRL4;
+	regvals[4].reg = REG_LONG_HIGH;
 	regvals[4].val = 0;
 
-	regvals[5].reg = REG_CMD_CTRL1;
+	regvals[5].reg = REG_LONG_STROBE;
 	regvals[5].val = 0;
 
 	regvals[6].reg = REG_DIV_BYPASS;
@@ -885,16 +887,16 @@ SR_PRIV int lwla_start_acquisition(const struct sr_dev_inst *sdi)
 
 	regvals = devc->reg_write_seq;
 
-	regvals[0].reg = REG_CMD_CTRL2;
+	regvals[0].reg = REG_LONG_ADDR;
 	regvals[0].val = 10;
 
-	regvals[1].reg = REG_CMD_CTRL3;
+	regvals[1].reg = REG_LONG_LOW;
 	regvals[1].val = 1;
 
-	regvals[2].reg = REG_CMD_CTRL4;
+	regvals[2].reg = REG_LONG_HIGH;
 	regvals[2].val = 0;
 
-	regvals[3].reg = REG_CMD_CTRL1;
+	regvals[3].reg = REG_LONG_STROBE;
 	regvals[3].val = 0;
 
 	devc->reg_write_pos = 0;
@@ -972,7 +974,7 @@ SR_PRIV int lwla_receive_data(int fd, int revents, void *cb_data)
 
 	/* If no event flags are set the timeout must have expired. */
 	if (revents == 0 && devc->state == STATE_STATUS_WAIT) {
-		if (sdi->status == SR_ST_STOPPING)
+		if (devc->cancel_requested)
 			issue_stop_capture(sdi);
 		else
 			request_capture_status(sdi);