X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=56176cc7eda1e3b8496545934543801aea424282;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=c9ca8f0a28eb8d734fd1474e689117024d7d4641;hpb=aeabd30820bd3b685fb0bac83d1dc4a7faa32287;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index c9ca8f0a..56176cc7 100644
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -22,17 +22,17 @@
 #define SERIALCOMM "115200/8n1"
 
 static const int hwopts[] = {
-	SR_HWOPT_CONN,
-	SR_HWOPT_SERIALCOMM,
+	SR_CONF_CONN,
+	SR_CONF_SERIALCOMM,
 	0,
 };
 
 static const int hwcaps[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_SAMPLERATE,
-	SR_HWCAP_CAPTURE_RATIO,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_RLE,
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_CAPTURE_RATIO,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_RLE,
 	0,
 };
 
@@ -44,12 +44,12 @@ SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = {
 	NULL,
 };
 
-/* default supported samplerates, can be overridden by device metadata */
+/* Default supported samplerates, can be overridden by device metadata. */
 static const struct sr_samplerates samplerates = {
-	SR_HZ(10),
-	SR_MHZ(200),
-	SR_HZ(1),
-	NULL,
+	.low  = SR_HZ(10),
+	.high = SR_MHZ(200),
+	.step = SR_HZ(1),
+	.list = NULL,
 };
 
 SR_PRIV struct sr_dev_driver ols_driver_info;
@@ -57,21 +57,12 @@ static struct sr_dev_driver *di = &ols_driver_info;
 
 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)
 {
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
@@ -84,18 +75,20 @@ static GSList *hw_scan(GSList *options)
 	char buf[8];
 
 	(void)options;
+
 	drvc = di->priv;
+
 	devices = NULL;
 
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
-		case SR_HWOPT_CONN:
-			conn = opt->value;
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			conn = src->value;
 			break;
-		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+		case SR_CONF_SERIALCOMM:
+			serialcomm = src->value;
 			break;
 		}
 	}
@@ -180,11 +173,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-	struct drv_context *drvc;
-
-	drvc = di->priv;
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -250,31 +239,12 @@ static int hw_cleanup(void)
 	return ret;
 }
 
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	switch (info_id) {
-	case SR_DI_HWOPTS:
-		*data = hwopts;
-		break;
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = ols_probe_names;
-		break;
-	case SR_DI_SAMPLERATES:
-		*data = &samplerates;
-		break;
-	case SR_DI_TRIGGER_TYPES:
-		*data = (char *)TRIGGER_TYPES;
-		break;
-	case SR_DI_CUR_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		if (sdi) {
 			devc = sdi->priv;
 			*data = &devc->cur_samplerate;
@@ -288,8 +258,7 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	int ret;
@@ -300,12 +269,12 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR;
 
-	switch (hwcap) {
-	case SR_HWCAP_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		ret = ols_set_samplerate(sdi, *(const uint64_t *)value,
 					 &samplerates);
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
 		tmp_u64 = value;
 		if (*tmp_u64 < MIN_NUM_SAMPLES)
 			return SR_ERR;
@@ -315,7 +284,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		sr_info("Sample limit is %" PRIu64 ".", devc->limit_samples);
 		ret = SR_OK;
 		break;
-	case SR_HWCAP_CAPTURE_RATIO:
+	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = *(const uint64_t *)value;
 		if (devc->capture_ratio < 0 || devc->capture_ratio > 100) {
 			devc->capture_ratio = 0;
@@ -323,7 +292,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		} else
 			ret = SR_OK;
 		break;
-	case SR_HWCAP_RLE:
+	case SR_CONF_RLE:
 		if (GPOINTER_TO_INT(value)) {
 			sr_info("Enabling RLE.");
 			devc->flag_reg |= FLAG_RLE;
@@ -337,12 +306,34 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return ret;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		*data = hwopts;
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	case SR_CONF_SAMPLERATE:
+		*data = &samplerates;
+		break;
+	case SR_CONF_TRIGGER_TYPE:
+		*data = (char *)TRIGGER_TYPE;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 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 sr_datafeed_meta_logic meta;
 	struct dev_context *devc;
 	uint32_t trigger_config[4];
 	uint32_t data;
@@ -464,37 +455,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	if (send_shortcommand(devc->serial, CMD_RUN) != SR_OK)
 		return SR_ERR;
 
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+
 	sr_source_add(devc->serial->fd, G_IO_IN, -1, ols_receive_data,
 		      cb_data);
 
-	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("Datafeed packet malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("Datafeed header malloc failed.");
-		g_free(packet);
-		return SR_ERR_MALLOC;
-	}
-
-	/* Send header packet to the session bus. */
-	packet->type = SR_DF_HEADER;
-	packet->payload = (unsigned char *)header;
-	header->feed_version = 1;
-	gettimeofday(&header->starttime, NULL);
-	sr_session_send(cb_data, packet);
-
-	/* Send metadata about the SR_DF_LOGIC packets to come. */
-	packet->type = SR_DF_META_LOGIC;
-	packet->payload = &meta;
-	meta.samplerate = devc->cur_samplerate;
-	meta.num_probes = NUM_PROBES;
-	sr_session_send(cb_data, packet);
-
-	g_free(header);
-	g_free(packet);
-
 	return SR_OK;
 }
 
@@ -518,10 +484,11 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = hw_cleanup,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,