X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=8694d8fde6c8eb607742305c22b2d91553968312;hb=8a63a4064eb5a759dd438e5d1fe9e9d21d7a3e69;hp=604849c46ee2872183b8a736ec7e35a63da1b606;hpb=89efe06460024c2a33e57178f5812bf23c2f9888;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 604849c4..8694d8fd 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 #include "beaglelogic.h"
 
@@ -144,16 +145,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc = sdi->priv;
@@ -199,29 +190,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-	struct drv_context *drvc;
-	struct sr_dev_inst *sdi;
-	GSList *l;
-
-	/* unused driver */
-	if (!(drvc = di->context))
-		return SR_OK;
-
-	/* Clean up the instances */
-	for (l = drvc->instances; l; l = l->next) {
-		sdi = l->data;
-		di->dev_close(sdi);
-		g_free(sdi->priv);
-		sr_dev_inst_free(sdi);
-	}
-	g_slist_free(drvc->instances);
-	drvc->instances = NULL;
-
-	return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -283,10 +251,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		return beaglelogic_set_triggerflags(devc);
 	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = g_variant_get_uint64(data);
-		if (devc->capture_ratio > 100) {
-			devc->capture_ratio = 0;
+		if (devc->capture_ratio > 100)
 			return SR_ERR;
-		}
 		return SR_OK;
 	default:
 		return SR_ERR_NA;
@@ -338,19 +304,14 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 #define BUFUNIT_TIMEOUT_MS(devc)	(100 + ((devc->bufunitsize * 1000) / \
 				(uint32_t)(devc->cur_samplerate)))
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-				    void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-	(void)cb_data;
 	struct dev_context *devc = sdi->priv;
 	struct sr_trigger *trigger;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	/* Save user pointer */
-	devc->cb_data = cb_data;
-
 	/* Clear capture state */
 	devc->bytes_read = 0;
 	devc->offset = 0;
@@ -371,7 +332,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 		devc->trigger_fired = FALSE;
 	} else
 		devc->trigger_fired = TRUE;
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Trigger and add poll on file */
 	beaglelogic_start(devc);
@@ -382,12 +343,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc = sdi->priv;
-	struct sr_datafeed_packet pkt;
-
-	(void)cb_data;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -400,9 +358,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 	/* Remove session source and send EOT packet */
 	sr_session_source_remove_pollfd(sdi->session, &devc->pollfd);
-	pkt.type = SR_DF_END;
-	pkt.payload = NULL;
-	sr_session_send(sdi, &pkt);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	return SR_OK;
 }
@@ -412,10 +368,9 @@ SR_PRIV struct sr_dev_driver beaglelogic_driver_info = {
 	.longname = "BeagleLogic",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_list = std_dev_list,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,