X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=488edc9d4b3d3ff080a77f5577e3c0771c51175d;hp=4af47d2da2a3fe0470fee124af052e62fbcff140;hb=3aa87d4c38b26d337bf7bf5eb44b6a4650709804;hpb=f1f703bf0dc63e2b6149f4cfba294253991d04f7

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 4af47d2..488edc9 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -36,6 +36,8 @@
 
 #define DEFAULT_OUTPUT_FORMAT "bits:width=64"
 
+static struct sr_context *sr_ctx = NULL;
+
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 static struct sr_output_format *output_format = NULL;
@@ -162,7 +164,7 @@ static GSList *device_scan(void)
 			return NULL;
 		}
 		g_free(drvname);
-		if (sr_driver_init(driver) != SR_OK) {
+		if (sr_driver_init(sr_ctx, driver) != SR_OK) {
 			g_critical("Failed to initialize driver.");
 			return NULL;
 		}
@@ -178,7 +180,7 @@ static GSList *device_scan(void)
 		drivers = sr_driver_list();
 		for (i = 0; drivers[i]; i++) {
 			driver = drivers[i];
-			if (sr_driver_init(driver) != SR_OK) {
+			if (sr_driver_init(sr_ctx, driver) != SR_OK) {
 				g_critical("Failed to initialize driver.");
 				return NULL;
 			}
@@ -538,7 +540,7 @@ static void show_pd_detail(void)
 }
 
 static void datafeed_in(const struct sr_dev_inst *sdi,
-		struct sr_datafeed_packet *packet)
+		const struct sr_datafeed_packet *packet)
 {
 	static struct sr_output *o = NULL;
 	static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 };
@@ -549,10 +551,10 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 	static FILE *outfile = NULL;
 	static int num_analog_probes = 0;
 	struct sr_probe *probe;
-	struct sr_datafeed_logic *logic;
-	struct sr_datafeed_meta_logic *meta_logic;
-	struct sr_datafeed_analog *analog;
-	struct sr_datafeed_meta_analog *meta_analog;
+	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_meta_logic *meta_logic;
+	const struct sr_datafeed_analog *analog;
+	const struct sr_datafeed_meta_analog *meta_analog;
 	static int num_enabled_analog_probes = 0;
 	int num_enabled_probes, sample_size, ret, i;
 	uint64_t output_len, filter_out_len;
@@ -1286,8 +1288,6 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 			g_critical("Failed to set device option '%s'.", (char *)key);
 			return ret;
 		}
-		else
-			break;
 	}
 
 	return SR_OK;
@@ -1476,7 +1476,6 @@ int main(int argc, char **argv)
 	int ret = 1;
 	GOptionContext *context;
 	GError *error;
-	struct sr_context *sr_ctx = NULL;
 
 	g_log_set_default_handler(logger, NULL);