X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-cli.c;h=b88250f1dae1df7e6bf5ba4b0c382ab532c9d1ad;hb=a210c4ccc2a730c8e02e3f330fbff36b7f81e2da;hp=1627522d27748efc18e3adb3a7d9891e0412a897;hpb=b921027525e5dbde831dfde9b0793b2afff3854d;p=sigrok-cli.git

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 1627522..b88250f 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -85,8 +85,8 @@ static GOptionEntry optargs[] = {
 
 static void show_version(void)
 {
-	GSList *plugins, *p, *l;
-	struct sr_dev_plugin *plugin;
+	GSList *l;
+	struct sr_dev_driver **drivers;
 	struct sr_input_format **inputs;
 	struct sr_output_format **outputs;
 	struct srd_decoder *dec;
@@ -95,10 +95,9 @@ static void show_version(void)
 	printf("sigrok-cli %s\n\n", VERSION);
 
 	printf("Supported hardware drivers:\n");
-	plugins = sr_hw_list();
-	for (p = plugins; p; p = p->next) {
-		plugin = p->data;
-		printf("  %-20s %s\n", plugin->name, plugin->longname);
+	drivers = sr_hw_list();
+	for (i = 0; drivers[i]; i++) {
+		printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
 	}
 	printf("\n");
 
@@ -178,7 +177,7 @@ static void show_dev_detail(void)
 	struct sr_dev *dev;
 	struct sr_hwcap_option *hwo;
 	const struct sr_samplerates *samplerates;
-	int cap, *capabilities, i;
+	int cap, *hwcaps, i;
 	char *s, *title;
 	const char *charopts, **stropts;
 
@@ -201,9 +200,9 @@ static void show_dev_detail(void)
 	}
 
 	title = "Supported options:\n";
-	capabilities = dev->plugin->get_capabilities();
-	for (cap = 0; capabilities[cap]; cap++) {
-		if (!(hwo = sr_hw_hwcap_get(capabilities[cap])))
+	hwcaps = dev->driver->hwcap_get_all();
+	for (cap = 0; hwcaps[cap]; cap++) {
+		if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
 			continue;
 
 		if (title) {
@@ -211,7 +210,7 @@ static void show_dev_detail(void)
 			title = NULL;
 		}
 
-		if (hwo->capability == SR_HWCAP_PATTERN_MODE) {
+		if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
 			printf("    %s", hwo->shortname);
 			if (sr_dev_info_get(dev, SR_DI_PATTERNMODES,
 					(const void **)&stropts) == SR_OK) {
@@ -221,7 +220,7 @@ static void show_dev_detail(void)
 			} else {
 				printf("\n");
 			}
-		} else if (hwo->capability == SR_HWCAP_SAMPLERATE) {
+		} else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
 			printf("    %s", hwo->shortname);
 			/* Supported samplerates */
 			if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
@@ -249,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 {
@@ -733,7 +732,7 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 	g_hash_table_iter_init(&iter, args);
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
 		found = FALSE;
-		for (i = 0; sr_hwcap_options[i].capability; i++) {
+		for (i = 0; sr_hwcap_options[i].hwcap; i++) {
 			if (strcmp(sr_hwcap_options[i].shortname, key))
 				continue;
 			if ((value == NULL) && 
@@ -747,20 +746,20 @@ 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->set_configuration(dev->plugin_index,
-						sr_hwcap_options[i].capability, &tmp_u64);
+				ret = dev->driver->dev_config_set(dev->driver_index,
+					sr_hwcap_options[i].hwcap, &tmp_u64);
 				break;
 			case SR_T_CHAR:
-				ret = dev->plugin->set_configuration(dev->plugin_index,
-						sr_hwcap_options[i].capability, value);
+				ret = dev->driver->dev_config_set(dev->driver_index,
+					sr_hwcap_options[i].hwcap, value);
 				break;
 			case SR_T_BOOL:
 				if (!value)
 					tmp_bool = TRUE;
 				else 
 					tmp_bool = sr_parse_boolstring(value);
-				ret = dev->plugin->set_configuration(dev->plugin_index,
-						sr_hwcap_options[i].capability, 
+				ret = dev->driver->dev_config_set(dev->driver_index,
+						sr_hwcap_options[i].hwcap, 
 						GINT_TO_POINTER(tmp_bool));
 				break;
 			default:
@@ -837,7 +836,7 @@ static void run_session(void)
             return;
 
 	if (opt_continuous) {
-		if (!sr_hw_has_hwcap(dev->plugin, SR_HWCAP_CONTINUOUS)) {
+		if (!sr_hw_has_hwcap(dev->driver, SR_HWCAP_CONTINUOUS)) {
 			printf("This device does not support continuous sampling.");
 			sr_session_destroy();
 			return;
@@ -869,9 +868,9 @@ static void run_session(void)
 			return;
 		}
 
-		if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
-			if (dev->plugin->set_configuration(dev->plugin_index,
-							  SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+		if (sr_hw_has_hwcap(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();
 				return;
@@ -895,8 +894,8 @@ static void run_session(void)
 				return;
 			}
 
-			if (dev->plugin->set_configuration(dev->plugin_index,
-						  SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+			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();
 				return;
@@ -906,15 +905,15 @@ static void run_session(void)
 
 	if (opt_samples) {
 		if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-			|| (dev->plugin->set_configuration(dev->plugin_index,
-					SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
+			|| (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();
 			return;
 		}
 	}
 
-	if (dev->plugin->set_configuration(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();