X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fapi.c;h=66eff890a107ea39b3e76070e54abae070a7b3aa;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=3a132a179ca13d1ea451a7a8850080bd7ec6b3f5;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 3a132a17..66eff890 100644
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -31,7 +31,6 @@
 #define VICTOR_VENDOR "Victor"
 #define VICTOR_INTERFACE 0
 #define VICTOR_ENDPOINT (LIBUSB_ENDPOINT_IN | 1)
-static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static const uint32_t drvopts[] = {
 	SR_CONF_MULTIMETER,
@@ -121,7 +120,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 		sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
 		return SR_ERR;
 	}
-	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
 }
@@ -133,13 +131,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 
 	if (!usb->devhdl)
-		/*  Nothing to do. */
-		return SR_OK;
+		return SR_ERR_BUG;
 
 	libusb_release_interface(usb->devhdl, VICTOR_INTERFACE);
 	libusb_close(usb->devhdl);
 	usb->devhdl = NULL;
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
@@ -178,9 +174,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	return sr_sw_limits_config_set(&devc->limits, key, data);
@@ -222,13 +215,13 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 	devc = sdi->priv;
 	if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE) {
 		/* USB device was unplugged. */
-		dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 	} else if (transfer->status == LIBUSB_TRANSFER_COMPLETED) {
 		sr_dbg("Got %d-byte packet.", transfer->actual_length);
 		if (transfer->actual_length == DMM_DATA_SIZE) {
 			victor_dmm_receive_data(sdi, transfer->buffer);
 			if (sr_sw_limits_check(&devc->limits))
-				dev_acquisition_stop(sdi);
+				sr_dev_acquisition_stop(sdi);
 		}
 	}
 	/* Anything else is either an error or a timeout, which is fine:
@@ -241,7 +234,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 			       libusb_error_name(ret));
 			g_free(transfer->buffer);
 			libusb_free_transfer(transfer);
-			dev_acquisition_stop(sdi);
+			sr_dev_acquisition_stop(sdi);
 		}
 	} else {
 		/* This was the last transfer we're going to receive, so
@@ -268,12 +261,12 @@ static int handle_events(int fd, int revents, void *cb_data)
 	drvc = di->context;
 
 	if (sr_sw_limits_check(&devc->limits))
-		dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 
 	if (sdi->status == SR_ST_STOPPING) {
 		usb_source_remove(sdi->session, drvc->sr_ctx);
 		dev_close(sdi);
-		std_session_send_df_end(sdi, LOG_PREFIX);
+		std_session_send_df_end(sdi);
 	}
 
 	memset(&tv, 0, sizeof(struct timeval));
@@ -292,12 +285,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	int ret;
 	unsigned char *buf;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	usb = sdi->conn;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	usb_source_add(sdi->session, drvc->sr_ctx, 100,
 			handle_events, (void *)sdi);
@@ -323,11 +313,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("Device not active, can't stop acquisition.");
-		return SR_ERR;
-	}
-
 	sdi->status = SR_ST_STOPPING;
 
 	return SR_OK;