X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=367353623a124cb30def0e9bd3a9e3b653a53b0c;hp=a626636dd137644f3b07ce5115ce074dcd5798ec;hb=e2fe62cc46b53689105f2434c35cabb238f369b0;hpb=5acb76821f33f03745e26c91fbb9cc7bcf34512a;ds=sidebyside

diff --git a/sigrok-cli.c b/sigrok-cli.c
index a626636..3673536 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;
 			}
@@ -821,7 +823,6 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
 	int ret;
 	char **pdtokens, **pdtok, *pd_name;
 
-	/* Avoid compiler warnings. */
 	(void)dev;
 
 	ret = 0;
@@ -1458,7 +1459,6 @@ static void run_session(void)
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 		   const gchar *message, gpointer cb_data)
 {
-	/* Avoid compiler warnings. */
 	(void)log_domain;
 	(void)cb_data;
 
@@ -1478,7 +1478,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);