X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fgenericdmm%2Fapi.c;h=a8e13beeff7c119e29608cb5aec049ea4de733ff;hb=a5b35a167a32ffbaee1ce9c0de8501f781f733d1;hp=c182b039d1110dea7520d6c70c8c2622e64619f2;hpb=25a0f108f4512ade836fed128c3ad649dedcb788;p=libsigrok.git

diff --git a/hardware/genericdmm/api.c b/hardware/genericdmm/api.c
index c182b039..a8e13bee 100644
--- a/hardware/genericdmm/api.c
+++ b/hardware/genericdmm/api.c
@@ -426,12 +426,12 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int dev_info_id, const void **data,
+static int hw_info_get(int info_id, const void **data,
 		const struct sr_dev_inst *sdi)
 {
 	struct context *ctx;
 
-	switch (dev_info_id) {
+	switch (info_id) {
 	case SR_DI_INST:
 		*data = sdi;
 		sr_spew("genericdmm: Returning sdi.");
@@ -460,20 +460,6 @@ static int hw_info_get(int dev_info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
-{
-	struct sr_dev_inst *sdi;
-
-	if (!(sdi = sr_dev_inst_get(gdi->instances, dev_index))) {
-		sr_err("genericdmm: sdi was NULL, device not found.");
-		return SR_ST_NOT_FOUND;
-	}
-
-	sr_dbg("genericdmm: Returning status: %d.", sdi->status);
-
-	return sdi->status;
-}
-
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		const void *value)
 {
@@ -536,19 +522,14 @@ 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_analog meta;
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(gdi->instances, dev_index))) {
-		sr_err("genericdmm: sdi was NULL.");
-		return SR_ERR_BUG;
-	}
-
 	if (!(ctx = sdi->priv)) {
 		sr_err("genericdmm: sdi->priv was NULL.");
 		return SR_ERR_BUG;
@@ -587,12 +568,13 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	return SR_OK;
 }
 
-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;
 
 	sr_dbg("genericdmm: Stopping acquisition.");
 
@@ -614,7 +596,6 @@ SR_PRIV struct sr_dev_driver genericdmm_driver_info = {
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
 	.info_get = hw_info_get,
-	.dev_status_get = hw_dev_status_get,
 	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,