X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=7a83b58ba53e1b89b846c7dc68f7bd5de4f99895;hb=aee878fa2efb8483bf93fa3bb03508357fc713a8;hp=87edea6f52ba936580381225b1200c13851033ac;hpb=3ffb6964a1585b5f6ffa0747c089a1cd557e4feb;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 87edea6f..7a83b58b 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -315,10 +315,10 @@ static int configure_probes(struct context *ctx, GSList *probes)
 		if (probe->enabled == FALSE)
 			continue;
 
-		if (probe->index > 8)
+		if (probe->index > 7)
 			ctx->sample_wide = TRUE;
 
-		probe_bit = 1 << (probe->index - 1);
+		probe_bit = 1 << (probe->index);
 		if (!(probe->trigger))
 			continue;
 
@@ -600,9 +600,6 @@ static int hw_info_get(int info_id, const void **data,
 	struct context *ctx;
 
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
@@ -638,17 +635,6 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
-{
-	const struct sr_dev_inst *const sdi =
-		sr_dev_inst_get(fdi->instances, dev_index);
-
-	if (!sdi)
-		return SR_ST_NOT_FOUND;
-
-	return sdi->status;
-}
-
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		const void *value)
 {
@@ -1030,7 +1016,6 @@ SR_PRIV struct sr_dev_driver fx2lafw_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,