X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=6deafb8102f93234eb12e342a4b1870f9a2d1b0d;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=12af5c1db6660891406128b93879f8409ced74fd;hpb=41812aca436805b0614f2a8f31cf2f8ce494aea0;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 12af5c1d..6deafb81 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -17,11 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 #include "beaglelogic.h"
 
-SR_PRIV struct sr_dev_driver beaglelogic_driver_info;
-
 /* Scan options */
 static const uint32_t scanopts[] = {
 	SR_CONF_NUM_LOGIC_CHANNELS,
@@ -59,11 +58,6 @@ static const uint64_t samplerates[] = {
 	SR_HZ(1),
 };
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static struct dev_context *beaglelogic_devc_alloc(void)
 {
 	struct dev_context *devc;
@@ -144,16 +138,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;
@@ -165,6 +149,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	/* Set fd and local attributes */
 	devc->pollfd.fd = devc->fd;
 	devc->pollfd.events = G_IO_IN;
+	devc->pollfd.revents = 0;
 
 	/* Get the default attributes */
 	beaglelogic_get_samplerate(devc);
@@ -198,29 +183,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)
 {
@@ -282,10 +244,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;
@@ -337,19 +297,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;
@@ -370,7 +325,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);
@@ -381,12 +336,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;
@@ -399,22 +351,19 @@ 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;
 }
 
-SR_PRIV struct sr_dev_driver beaglelogic_driver_info = {
+static struct sr_dev_driver beaglelogic_driver_info = {
 	.name = "beaglelogic",
 	.longname = "BeagleLogic",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.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,
@@ -424,3 +373,4 @@ SR_PRIV struct sr_dev_driver beaglelogic_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(beaglelogic_driver_info);