X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=3bf5609544763b13f37d7aff975083eac1cdbc54;hb=ca314e060f653e6a0b5ec0f58914bac4d426217f;hp=11721ebe6bbc72d0a6933ff8c880cd7eefa5f865;hpb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;p=libsigrok.git

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 11721ebe..3bf56095 100644
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -20,14 +20,14 @@
 #include <config.h>
 #include "protocol.h"
 
-static const uint32_t drvopts[] = {
-	SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+	SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
 	SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_LIST,
@@ -43,21 +43,15 @@ static const int32_t trigger_matches[] = {
 	SR_TRIGGER_FALLING,
 };
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi);
-
-static void clear_helper(void *priv)
+static void clear_helper(struct dev_context *devc)
 {
-	struct dev_context *devc;
-
-	devc = priv;
-
 	ftdi_free(devc->ftdic);
 	g_free(devc->final_buf);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-	return std_dev_clear(di, clear_helper);
+	return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
 static int add_device(int model, struct libusb_device_descriptor *des,
@@ -71,7 +65,6 @@ static int add_device(int model, struct libusb_device_descriptor *des,
 
 	ret = SR_OK;
 
-	/* Allocate memory for our private device context. */
 	devc = g_malloc0(sizeof(struct dev_context));
 
 	/* Set some sane defaults. */
@@ -103,7 +96,6 @@ static int add_device(int model, struct libusb_device_descriptor *des,
 	/* We now know the device, set its max. samplerate as default. */
 	devc->cur_samplerate = devc->prof->max_samplerate;
 
-	/* Register the device with libsigrok. */
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("ChronoVu");
@@ -237,7 +229,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	/* Allocate memory for the FTDI context and initialize it. */
 	if (!(devc->ftdic = ftdi_new())) {
 		sr_err("Failed to initialize libftdi.");
 		return SR_ERR;
@@ -246,43 +237,33 @@ static int dev_open(struct sr_dev_inst *sdi)
 	sr_dbg("Opening %s device (%04x:%04x).", devc->prof->modelname,
 	       devc->usb_vid, devc->usb_pid);
 
-	/* Open the device. */
 	if ((ret = ftdi_usb_open_desc(devc->ftdic, devc->usb_vid,
 			devc->usb_pid, devc->prof->iproduct, NULL)) < 0) {
 		sr_err("Failed to open FTDI device (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_ftdi_free;
 	}
-	sr_dbg("Device opened successfully.");
 
-	/* Purge RX/TX buffers in the FTDI chip. */
 	if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0) {
 		sr_err("Failed to purge FTDI buffers (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_ftdi_free;
 	}
-	sr_dbg("FTDI buffers purged successfully.");
 
-	/* Enable flow control in the FTDI chip. */
 	if ((ret = ftdi_setflowctrl(devc->ftdic, SIO_RTS_CTS_HS)) < 0) {
 		sr_err("Failed to enable FTDI flow control (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_ftdi_free;
 	}
-	sr_dbg("FTDI flow control enabled successfully.");
 
-	/* Wait 100ms. */
 	g_usleep(100 * 1000);
 
-	sdi->status = SR_ST_ACTIVE;
-
-	if (ret == SR_OK)
-		return SR_OK;
+	return SR_OK;
 
 err_ftdi_free:
 	ftdi_free(devc->ftdic); /* Close device (if open), free FTDI context. */
 	devc->ftdic = NULL;
-	return ret;
+	return SR_ERR;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -290,17 +271,16 @@ static int dev_close(struct sr_dev_inst *sdi)
 	int ret;
 	struct dev_context *devc;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_OK;
-
 	devc = sdi->priv;
 
-	if (devc->ftdic && (ret = ftdi_usb_close(devc->ftdic)) < 0)
+	if (!devc->ftdic)
+		return SR_ERR_BUG;
+
+	if ((ret = ftdi_usb_close(devc->ftdic)) < 0)
 		sr_err("Failed to close FTDI device (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
-	sdi->status = SR_ST_INACTIVE;
 
-	return SR_OK;
+	return (ret == 0) ? SR_OK : SR_ERR;
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -339,9 +319,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;
 
 	switch (key) {
@@ -373,25 +350,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	GVariantBuilder gvb;
 	struct dev_context *devc;
 
-	(void)cg;
+	devc = (sdi) ? sdi->priv : NULL;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		break;
 	case SR_CONF_DEVICE_OPTIONS:
-		if (!sdi)
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		else
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-		break;
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_SAMPLERATE:
-		if (!sdi)
-			return SR_ERR_BUG;
-		devc = sdi->priv;
 		cv_fill_samplerates_if_needed(sdi);
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
 		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
@@ -402,7 +367,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		*data = g_variant_builder_end(&gvb);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
-		if (!sdi || !sdi->priv || !(devc = sdi->priv) || !devc->prof)
+		if (!devc->prof)
 			return SR_ERR_BUG;
 		grange[0] = g_variant_new_uint64(0);
 		if (devc->prof->model == CHRONOVU_LA8)
@@ -412,7 +377,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		*data = g_variant_new_tuple(grange, 2);
 		break;
 	case SR_CONF_TRIGGER_MATCH:
-		if (!sdi || !sdi->priv || !(devc = sdi->priv) || !devc->prof)
+		if (!devc->prof)
 			return SR_ERR_BUG;
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				trigger_matches, devc->prof->num_trigger_matches,
@@ -452,7 +417,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 	/* Get one block of data. */
 	if ((ret = cv_read_block(devc)) < 0) {
 		sr_err("Failed to read data block: %d.", ret);
-		dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 		return FALSE;
 	}
 
@@ -475,7 +440,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 	for (i = 0; i < NUM_BLOCKS; i++)
 		cv_send_block_to_session_bus(sdi, i);
 
-	dev_acquisition_stop(sdi);
+	sr_dev_acquisition_stop(sdi);
 
 	return TRUE;
 }
@@ -486,9 +451,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	uint8_t buf[8];
 	int bytes_to_write, bytes_written;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	if (!devc->ftdic) {
@@ -534,8 +496,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	sr_dbg("Hardware acquisition started successfully.");
-
 	std_session_send_df_header(sdi);
 
 	/* Time when we should be done (for detecting trigger timeouts). */
@@ -552,7 +512,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	sr_dbg("Stopping acquisition.");
 	sr_session_source_remove(sdi->session, -1);
 	std_session_send_df_end(sdi);