X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=d5427a785b82e4287799363d09c77be30e07ef7c;hp=1b34bf5c9701ccd772ce2b696cca02e207cc9fb2;hb=68cdf174d18df9b5a69eea60469caf32d265a906;hpb=bc8e240025339710ddf4f9f0827275ae9a1fe9b7;ds=sidebyside

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 1b34bf5..d5427a7 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -86,7 +86,7 @@ static GOptionEntry optargs[] = {
 static void show_version(void)
 {
 	GSList *l;
-	struct sr_dev_plugin **plugins;
+	struct sr_dev_driver **drivers;
 	struct sr_input_format **inputs;
 	struct sr_output_format **outputs;
 	struct srd_decoder *dec;
@@ -95,9 +95,9 @@ static void show_version(void)
 	printf("sigrok-cli %s\n\n", VERSION);
 
 	printf("Supported hardware drivers:\n");
-	plugins = sr_hw_list();
-	for (i = 0; plugins[i]; i++) {
-		printf("  %-20s %s\n", plugins[i]->name, plugins[i]->longname);
+	drivers = sr_driver_list();
+	for (i = 0; drivers[i]; i++) {
+		printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
 	}
 	printf("\n");
 
@@ -200,7 +200,7 @@ static void show_dev_detail(void)
 	}
 
 	title = "Supported options:\n";
-	hwcaps = dev->plugin->hwcap_get_all();
+	hwcaps = dev->driver->hwcap_get_all();
 	for (cap = 0; hwcaps[cap]; cap++) {
 		if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
 			continue;
@@ -248,7 +248,7 @@ static void show_dev_detail(void)
 			} else {
 				printf(" - supported samplerates:\n");
 				for (i = 0; samplerates->list[i]; i++) {
-					printf("      %7s\n", sr_samplerate_string(samplerates->list[i]));
+					printf("      %s\n", sr_samplerate_string(samplerates->list[i]));
 				}
 			}
 		} else {
@@ -514,13 +514,13 @@ err_out:
 	return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
+void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data)
 {
 	int i;
 	char **annotations;
 
-	/* 'user_data' is not used in this specific callback. */
-	(void)user_data;
+	/* 'cb_data' is not used in this specific callback. */
+	(void)cb_data;
 
 	if (pdata->ann_format != 0) {
 		/* CLI only shows the default annotation format. */
@@ -563,7 +563,7 @@ static int select_probes(struct sr_dev *dev)
 
 	for (i = 0; i < max_probes; i++) {
 		if (probelist[i]) {
-			sr_dev_probe_name(dev, i + 1, probelist[i]);
+			sr_dev_probe_name_set(dev, i + 1, probelist[i]);
 			g_free(probelist[i]);
 		} else {
 			probe = sr_dev_probe_find(dev, i + 1);
@@ -746,11 +746,11 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 				ret = sr_parse_sizestring(value, &tmp_u64);
 				if (ret != SR_OK)
 					break;
-				ret = dev->plugin->dev_config_set(dev->plugin_index,
+				ret = dev->driver->dev_config_set(dev->driver_index,
 					sr_hwcap_options[i].hwcap, &tmp_u64);
 				break;
 			case SR_T_CHAR:
-				ret = dev->plugin->dev_config_set(dev->plugin_index,
+				ret = dev->driver->dev_config_set(dev->driver_index,
 					sr_hwcap_options[i].hwcap, value);
 				break;
 			case SR_T_BOOL:
@@ -758,7 +758,7 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 					tmp_bool = TRUE;
 				else 
 					tmp_bool = sr_parse_boolstring(value);
-				ret = dev->plugin->dev_config_set(dev->plugin_index,
+				ret = dev->driver->dev_config_set(dev->driver_index,
 						sr_hwcap_options[i].hwcap, 
 						GINT_TO_POINTER(tmp_bool));
 				break;
@@ -836,7 +836,7 @@ static void run_session(void)
             return;
 
 	if (opt_continuous) {
-		if (!sr_hw_has_hwcap(dev->plugin, SR_HWCAP_CONTINUOUS)) {
+		if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
 			printf("This device does not support continuous sampling.");
 			sr_session_destroy();
 			return;
@@ -868,8 +868,8 @@ static void run_session(void)
 			return;
 		}
 
-		if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
-			if (dev->plugin->dev_config_set(dev->plugin_index,
+		if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+			if (dev->driver->dev_config_set(dev->driver_index,
 			    SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
 				printf("Failed to configure time limit.\n");
 				sr_session_destroy();
@@ -894,7 +894,7 @@ static void run_session(void)
 				return;
 			}
 
-			if (dev->plugin->dev_config_set(dev->plugin_index,
+			if (dev->driver->dev_config_set(dev->driver_index,
 			    SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
 				printf("Failed to configure time-based sample limit.\n");
 				sr_session_destroy();
@@ -905,7 +905,7 @@ static void run_session(void)
 
 	if (opt_samples) {
 		if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-			|| (dev->plugin->dev_config_set(dev->plugin_index,
+			|| (dev->driver->dev_config_set(dev->driver_index,
 			    SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
 			printf("Failed to configure sample limit.\n");
 			sr_session_destroy();
@@ -913,7 +913,7 @@ static void run_session(void)
 		}
 	}
 
-	if (dev->plugin->dev_config_set(dev->plugin_index,
+	if (dev->driver->dev_config_set(dev->driver_index,
 		  SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
 		printf("Failed to configure probes.\n");
 		sr_session_destroy();
@@ -943,11 +943,11 @@ static void run_session(void)
 }
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
-		   const gchar *message, gpointer user_data)
+		   const gchar *message, gpointer cb_data)
 {
 	/* Avoid compiler warnings. */
 	(void)log_domain;
-	(void)user_data;
+	(void)cb_data;
 
 	/*
 	 * All messages, warnings, errors etc. go to stderr (not stdout) in