X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=06aa053b83793495afebfcb0b9f3f9ad8ac9dad4;hp=83eef0879c48c72cfdf812cc09ad5c6fe067b40b;hb=548b7ddc8144ca0430f852c89ae4f2e61ab487d7;hpb=b46c4414825d1e8fb14a409bf21080974997fe57

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 83eef08..06aa053 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -94,7 +94,7 @@ static void show_version(void)
 
 	printf("sigrok-cli %s\n\n", VERSION);
 	printf("Supported hardware drivers:\n");
-	plugins = sr_list_hwplugins();
+	plugins = sr_hwplugins_list();
 	for (p = plugins; p; p = p->next) {
 		plugin = p->data;
 		printf("  %-20s %s\n", plugin->name, plugin->longname);
@@ -114,7 +114,7 @@ static void show_version(void)
 	printf("\n");
 
 	/* TODO: Error handling. */
-	srd_init();
+	srd_init(NULL);
 
 	printf("Supported protocol decoders:\n");
 	for (l = srd_list_decoders(); l; l = l->next) {
@@ -130,7 +130,7 @@ static void print_device_line(const struct sr_device *device)
 {
 	const struct sr_device_instance *sdi;
 
-	sr_device_get_info(device, SR_DI_INSTANCE, (const void **) &sdi);
+	sr_dev_get_info(device, SR_DI_INSTANCE, (const void **)&sdi);
 
 	if (sdi->vendor && sdi->vendor[0])
 		printf("%s ", sdi->vendor);
@@ -150,7 +150,7 @@ static void show_device_list(void)
 	int devcnt;
 
 	devcnt = 0;
-	devices = sr_device_list();
+	devices = sr_dev_list();
 
 	if (g_slist_length(devices) == 0)
 		return;
@@ -159,7 +159,7 @@ static void show_device_list(void)
 	demo_device = NULL;
 	for (l = devices; l; l = l->next) {
 		device = l->data;
-		if (sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE)) {
+		if (sr_dev_has_hwcap(device, SR_HWCAP_DEMO_DEVICE)) {
 			demo_device = device;
 			continue;
 		}
@@ -189,8 +189,8 @@ static void show_device_detail(void)
 
 	print_device_line(device);
 
-	if (sr_device_get_info(device, SR_DI_TRIGGER_TYPES,
-						   (const void **) &charopts) == SR_OK) {
+	if (sr_dev_get_info(device, SR_DI_TRIGGER_TYPES,
+					(const void **)&charopts) == SR_OK) {
 		printf("Supported triggers: ");
 		while (*charopts) {
 			printf("%c ", *charopts);
@@ -212,8 +212,8 @@ static void show_device_detail(void)
 
 		if (hwo->capability == SR_HWCAP_PATTERN_MODE) {
 			printf("    %s", hwo->shortname);
-			if (sr_device_get_info(device, SR_DI_PATTERNMODES,
-								   (const void **) &stropts) == SR_OK) {
+			if (sr_dev_get_info(device, SR_DI_PATTERNMODES,
+					(const void **)&stropts) == SR_OK) {
 				printf(" - supported modes:\n");
 				for (i = 0; stropts[i]; i++)
 					printf("      %s\n", stropts[i]);
@@ -223,8 +223,8 @@ static void show_device_detail(void)
 		} else if (hwo->capability == SR_HWCAP_SAMPLERATE) {
 			printf("    %s", hwo->shortname);
 			/* Supported samplerates */
-			if (sr_device_get_info(device, SR_DI_SAMPLERATES,
-								   (const void **) &samplerates) != SR_OK) {
+			if (sr_dev_get_info(device, SR_DI_SAMPLERATES,
+					(const void **)&samplerates) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -234,17 +234,17 @@ static void show_device_detail(void)
 				if (!(s = sr_samplerate_string(samplerates->low)))
 					continue;
 				printf(" (%s", s);
-				free(s);
+				g_free(s);
 				/* high */
 				if (!(s = sr_samplerate_string(samplerates->high)))
 					continue;
 				printf(" - %s", s);
-				free(s);
+				g_free(s);
 				/* step */
 				if (!(s = sr_samplerate_string(samplerates->step)))
 					continue;
 				printf(" in steps of %s)\n", s);
-				free(s);
+				g_free(s);
 			} else {
 				printf(" - supported samplerates:\n");
 				for (i = 0; samplerates->list[i]; i++) {
@@ -313,7 +313,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 	case SR_DF_HEADER:
 		g_message("cli: Received SR_DF_HEADER");
 		/* Initialize the output module. */
-		if (!(o = malloc(sizeof(struct sr_output)))) {
+		if (!(o = g_try_malloc(sizeof(struct sr_output)))) {
 			printf("Output module malloc failed.\n");
 			exit(1);
 		}
@@ -370,7 +370,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 			if (output_len) {
 				if (outfile)
 					fwrite(output_buf, 1, output_len, outfile);
-				free(output_buf);
+				g_free(output_buf);
 				output_len = 0;
 			}
 		}
@@ -383,7 +383,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 		sr_session_halt();
 		if (outfile && outfile != stdout)
 			fclose(outfile);
-		free(o);
+		g_free(o);
 		o = NULL;
 		break;
 	case SR_DF_TRIGGER:
@@ -398,8 +398,6 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 		sample_size = logic->unitsize;
 		g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
 		break;
-	case SR_DF_ANALOG:
-		break;
 	}
 
 	/* not supporting anything but SR_DF_LOGIC for now */
@@ -449,7 +447,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
 			o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
 		if (output_len) {
 			fwrite(output_buf, 1, output_len, outfile);
-			free(output_buf);
+			g_free(output_buf);
 		}
 	}
 
@@ -467,7 +465,7 @@ cleanup:
 static int register_pds(struct sr_device *device, const char *pdstring)
 {
 	GHashTable *pd_opthash;
-	struct srd_decoder_instance *di;
+	struct srd_decoder_inst *di;
 	char **pdtokens, **pdtok, *pd_name;
 
 	/* Avoid compiler warnings. */
@@ -486,17 +484,17 @@ static int register_pds(struct sr_device *device, const char *pdstring)
 
 		pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
 		g_hash_table_remove(pd_opthash, "sigrok_key");
-		if (!(di = srd_instance_new(pd_name, pd_opthash))) {
+		if (!(di = srd_inst_new(pd_name, pd_opthash))) {
 			fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
 			goto err_out;
 		}
-		g_datalist_set_data(&pd_ann_visible, di->instance_id, pd_name);
+		g_datalist_set_data(&pd_ann_visible, di->inst_id, pd_name);
 
 		/* Any keys left in the options hash are probes, where the key
 		 * is the probe name as specified in the decoder class, and the
 		 * value is the probe number i.e. the order in which the PD's
 		 * incoming samples are arranged. */
-		if (srd_instance_set_probes(di, pd_opthash) != SRD_OK)
+		if (srd_inst_set_probes(di, pd_opthash) != SRD_OK)
 			goto err_out;
 		g_hash_table_destroy(pd_opthash);
 		pd_opthash = NULL;
@@ -512,17 +510,20 @@ err_out:
 	return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata)
+void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
 {
 	int i;
 	char **annotations;
 
+	/* 'user_data' is not used in this specific callback. */
+	(void)user_data;
+
 	if (pdata->ann_format != 0) {
 		/* CLI only shows the default annotation format. */
 		return;
 	}
 
-	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->instance_id)) {
+	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->inst_id)) {
 		/* Not in the list of PDs whose annotations we're showing. */
 		return;
 	}
@@ -558,10 +559,10 @@ static int select_probes(struct sr_device *device)
 
 	for (i = 0; i < max_probes; i++) {
 		if (probelist[i]) {
-			sr_device_probe_name(device, i + 1, probelist[i]);
+			sr_dev_probe_name(device, i + 1, probelist[i]);
 			g_free(probelist[i]);
 		} else {
-			probe = sr_device_probe_find(device, i + 1);
+			probe = sr_dev_probe_find(device, i + 1);
 			probe->enabled = FALSE;
 		}
 	}
@@ -648,7 +649,7 @@ static void load_input_file_format(void)
 	}
 
 	/* Initialize the input module. */
-	if (!(in = malloc(sizeof(struct sr_input)))) {
+	if (!(in = g_try_malloc(sizeof(struct sr_input)))) {
 		printf("Failed to allocate input module.\n");
 		exit(1);
 	}
@@ -705,10 +706,10 @@ int num_real_devices(void)
 	int num_devices;
 
 	num_devices = 0;
-	devices = sr_device_list();
+	devices = sr_dev_list();
 	for (l = devices; l; l = l->next) {
 		device = l->data;
-		if (!sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE))
+		if (!sr_dev_has_hwcap(device, SR_HWCAP_DEMO_DEVICE))
 			num_devices++;
 	}
 
@@ -832,7 +833,7 @@ static void run_session(void)
 
 	if (opt_continuous) {
 		capabilities = device->plugin->get_capabilities();
-		if (!sr_find_hwcap(capabilities, SR_HWCAP_CONTINUOUS)) {
+		if (!sr_has_hwcap(capabilities, SR_HWCAP_CONTINUOUS)) {
 			printf("This device does not support continuous sampling.");
 			sr_session_destroy();
 			return;
@@ -849,7 +850,7 @@ static void run_session(void)
 		max_probes = g_slist_length(device->probes);
 		for (i = 0; i < max_probes; i++) {
 			if (probelist[i]) {
-				sr_device_trigger_set(device, i + 1, probelist[i]);
+				sr_dev_trigger_set(device, i + 1, probelist[i]);
 				g_free(probelist[i]);
 			}
 		}
@@ -865,7 +866,7 @@ static void run_session(void)
 		}
 
 		capabilities = device->plugin->get_capabilities();
-		if (sr_find_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
+		if (sr_has_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
 			if (device->plugin->set_configuration(device->plugin_index,
 							  SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
 				printf("Failed to configure time limit.\n");
@@ -878,12 +879,12 @@ static void run_session(void)
 			 * convert to samples based on the samplerate.
 			 */
 			limit_samples = 0;
-			if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+			if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
 				const uint64_t *samplerate;
 
-				sr_device_get_info(device, SR_DI_CUR_SAMPLERATE,
-								   (const void **) &samplerate);
-				limit_samples = (*samplerate) * time_msec / (uint64_t) 1000;
+				sr_dev_get_info(device, SR_DI_CUR_SAMPLERATE,
+						(const void **)&samplerate);
+				limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
 			}
 			if (limit_samples == 0) {
 				printf("Not enough time at this samplerate.\n");
@@ -970,7 +971,7 @@ int main(int argc, char **argv)
 	GHashTableIter iter;
 	gpointer key, value;
 	struct sr_output_format **outputs;
-	struct srd_decoder_instance *di_from, *di_to;
+	struct srd_decoder_inst *di_from, *di_to;
 	int i, ret;
 	char *fmtspec, **pds;
 
@@ -988,15 +989,15 @@ int main(int argc, char **argv)
 	}
 
 	/* Set the loglevel (amount of messages to output) for libsigrok. */
-	if (sr_set_loglevel(opt_loglevel) != SR_OK) {
-		fprintf(stderr, "cli: %s: sr_set_loglevel(%d) failed\n",
+	if (sr_log_loglevel_set(opt_loglevel) != SR_OK) {
+		fprintf(stderr, "cli: %s: sr_log_loglevel_set(%d) failed\n",
 			__func__, opt_loglevel);
 		return 1;
 	}
 
 	/* Set the loglevel (amount of messages to output) for libsigrokdecode. */
-	if (srd_set_loglevel(opt_loglevel) != SRD_OK) {
-		fprintf(stderr, "cli: %s: srd_set_loglevel(%d) failed\n",
+	if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) {
+		fprintf(stderr, "cli: %s: srd_log_loglevel_set(%d) failed\n",
 			__func__, opt_loglevel);
 		return 1;
 	}
@@ -1005,7 +1006,7 @@ int main(int argc, char **argv)
 		return 1;
 
 	if (opt_pds) {
-		if (srd_init() != SRD_OK) {
+		if (srd_init(NULL) != SRD_OK) {
 			printf("Failed to initialize sigrokdecode\n");
 			return 1;
 		}
@@ -1014,7 +1015,7 @@ int main(int argc, char **argv)
 			return 1;
 		}
 		if (srd_register_callback(SRD_OUTPUT_ANN,
-				show_pd_annotation) != SRD_OK) {
+				show_pd_annotation, NULL) != SRD_OK) {
 			printf("Failed to register protocol decoder callback\n");
 			return 1;
 		}
@@ -1027,22 +1028,22 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if (!(di_from = srd_instance_find_by_id(pds[0]))) {
+		if (!(di_from = srd_inst_find_by_id(pds[0]))) {
 			printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
 			return 1;
 		}
 		for (i = 1; pds[i]; i++) {
-			if (!(di_to = srd_instance_find_by_id(pds[i]))) {
+			if (!(di_to = srd_inst_find_by_id(pds[i]))) {
 				printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
 				return 1;
 			}
-			if ((ret = srd_instance_stack(di_from, di_to) != SRD_OK))
+			if ((ret = srd_inst_stack(di_from, di_to) != SRD_OK))
 				return ret;
 
 			/* Don't show annotation from this PD. Only the last PD in
 			 * the stack will be left on the annotation list.
 			 */
-			g_datalist_remove_data(&pd_ann_visible, di_from->instance_id);
+			g_datalist_remove_data(&pd_ann_visible, di_from->inst_id);
 
 			di_from = di_to;
 		}