X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=ad5e7f29ed86f9220202d471b5e7a0cfb509d97a;hb=5d9ed643e9dddbdb43e8917cff197346bdc930e7;hp=e486d519048ec6e8518dc02ab79de9f5bc7a9a18;hpb=2efc5948b6c2c436e339e333994ec7cc96db62be;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index e486d519..ad5e7f29 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -509,14 +509,10 @@ hw_init_free_ports:
 	return devices;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-		return SR_ERR;
-
 	ctx = sdi->priv;
 
 	ctx->serial->fd = serial_open(ctx->serial->port, O_RDWR);
@@ -528,19 +524,12 @@ static int hw_dev_open(int dev_index)
 	return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(odi->instances, dev_index))) {
-		sr_err("ols: %s: sdi was NULL", __func__);
-		return SR_ERR_BUG;
-	}
-
 	ctx = sdi->priv;
 
-	/* TODO */
 	if (ctx->serial->fd != -1) {
 		serial_close(ctx->serial->fd);
 		ctx->serial->fd = -1;
@@ -593,6 +582,9 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_INST:
 		*data = sdi;
 		break;
+	case SR_DI_HWCAPS:
+		*data = hwcaps;
+		break;
 	case SR_DI_NUM_PROBES:
 		*data = GINT_TO_POINTER(1);
 		break;
@@ -629,7 +621,7 @@ static int hw_dev_status_get(int dev_index)
 	return sdi->status;
 }
 
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
 {
 	struct context *ctx;
 
@@ -661,15 +653,13 @@ static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
 	return SR_OK;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+		const void *value)
 {
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
 	int ret;
 	const uint64_t *tmp_u64;
 
-	if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-		return SR_ERR;
 	ctx = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -894,12 +884,12 @@ static int receive_data(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+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 sr_dev_inst *sdi;
 	struct context *ctx;
 	uint32_t trigger_config[4];
 	uint32_t data;
@@ -908,9 +898,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	int num_channels;
 	int i;
 
-	if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-		return SR_ERR;
-
 	ctx = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -1054,12 +1041,13 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+		void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 
 	/* Avoid compiler warnings. */
-	(void)dev_index;
+	(void)sdi;
 
 	packet.type = SR_DF_END;
 	sr_session_send(cb_data, &packet);