X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fapi.c;h=94018372cdbe2f4a288d50e12fbf36928c90e60e;hb=7231a14590840ffdbb77c1cc076d7dcafa3ee673;hp=8ebb4ca0d4a3a6ba75aa420e2f31902ce0142e62;hpb=0d485e30c607b22b5f328512327e4e0fafc6cbb7;p=libsigrok.git

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 8ebb4ca0..94018372 100644
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -36,10 +36,15 @@ static const int hwopts[] = {
 static const int hwcaps[] = {
 	SR_CONF_THERMOMETER,
 	SR_CONF_HYGROMETER,
+	SR_CONF_DATALOG,
 	SR_CONF_LIMIT_SAMPLES,
 	0
 };
 
+/* Terrible hack */
+static int BOOL_TRUE = TRUE;
+static int BOOL_FALSE = FALSE;
+
 /* Properly close and free all devices. */
 static int clear_instances(void)
 {
@@ -70,17 +75,7 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-	struct drv_context *drvc;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	drvc->sr_ctx = sr_ctx;
-	di->priv = drvc;
-
-	return SR_OK;
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -95,10 +90,7 @@ static GSList *hw_scan(GSList *options)
 
 	(void)options;
 
-	if (!(drvc = di->priv)) {
-		sr_err("Driver was not initialized.");
-		return NULL;
-	}
+	drvc = di->priv;
 
 	/* USB scan is always authoritative. */
 	clear_instances();
@@ -140,14 +132,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-	struct drv_context *drvc;
-
-	if (!(drvc = di->priv)) {
-		sr_err("Driver was not initialized.");
-		return NULL;
-	}
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -191,7 +176,6 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 	libusb_release_interface(devc->usb->devhdl, LASCAR_INTERFACE);
 	libusb_close(devc->usb->devhdl);
 	devc->usb->devhdl = NULL;
-	g_free(devc->config);
 	sdi->status = SR_ST_INACTIVE;
 
 
@@ -215,9 +199,21 @@ static int hw_cleanup(void)
 
 static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
-	(void)sdi;
+	struct dev_context *devc;
+	int ret;
 
+	devc = sdi->priv;
 	switch (id) {
+	case SR_CONF_DATALOG:
+		if (!sdi)
+			return SR_ERR_ARG;
+		if ((ret = lascar_is_logging(sdi)) == -1)
+			return SR_ERR;
+		*data = ret ? &BOOL_TRUE : &BOOL_FALSE;
+		break;
+	case SR_CONF_LIMIT_SAMPLES:
+		*data = &devc->limit_samples;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -242,6 +238,15 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 	ret = SR_OK;
 	switch (id) {
+	case SR_CONF_DATALOG:
+		if (*(int *)value) {
+			/* Start logging. */
+			ret = lascar_start_logging(sdi);
+		} else {
+			/* Stop logging. */
+			ret = lascar_stop_logging(sdi);
+		}
+		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = *(const uint64_t *)value;
 		sr_dbg("Setting sample limit to %" PRIu64 ".",
@@ -306,10 +311,10 @@ static float binary32_le_to_float(unsigned char *buf)
 static int lascar_proc_config(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	int ret;
+	int dummy, ret;
 
 	devc = sdi->priv;
-	if (!(devc->config = lascar_get_config(devc->usb->devhdl)))
+	if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK)
 		return SR_ERR;
 
 	ret = SR_OK;
@@ -345,7 +350,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		void *cb_data)
 {
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_header header;
 	struct dev_context *devc;
 	struct drv_context *drvc = di->priv;
 	struct libusb_transfer *xfer_in, *xfer_out;
@@ -368,11 +372,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_dbg("Starting log retrieval.");
 
 	/* Send header packet to the session bus. */
-	sr_dbg("Sending SR_DF_HEADER.");
-	packet.type = SR_DF_HEADER;
-	packet.payload = (uint8_t *)&header;
-	header.feed_version = 1;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
 	if (devc->logged_samples == 0) {
 		/* This ensures the frontend knows the session is done. */