X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=21e3ad939afbe5b0ba0bb25f1100e36c60c98763;hp=86ac278250d6425d2be440f3b2adc315f1e0539c;hb=f81faab0eaf03aeea6476112f0f4e91fee709efc;hpb=c2c4a0def11bd2a589aa62f8f501ff20ef5f99e4

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 86ac278..21e3ad9 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -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_device_get_info(device, SR_DI_INSTANCE, (const void **)&sdi);
 
 	if (sdi->vendor && sdi->vendor[0])
 		printf("%s ", sdi->vendor);
@@ -190,7 +190,7 @@ 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) {
+					(const void **)&charopts) == SR_OK) {
 		printf("Supported triggers: ");
 		while (*charopts) {
 			printf("%c ", *charopts);
@@ -213,7 +213,7 @@ 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) {
+					(const void **)&stropts) == SR_OK) {
 				printf(" - supported modes:\n");
 				for (i = 0; stropts[i]; i++)
 					printf("      %s\n", stropts[i]);
@@ -224,7 +224,7 @@ static void show_device_detail(void)
 			printf("    %s", hwo->shortname);
 			/* Supported samplerates */
 			if (sr_device_get_info(device, SR_DI_SAMPLERATES,
-								   (const void **) &samplerates) != SR_OK) {
+					(const void **)&samplerates) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -510,11 +510,14 @@ 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;
@@ -830,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;
@@ -863,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");
@@ -880,8 +883,8 @@ static void run_session(void)
 				const uint64_t *samplerate;
 
 				sr_device_get_info(device, SR_DI_CUR_SAMPLERATE,
-								   (const void **) &samplerate);
-				limit_samples = (*samplerate) * time_msec / (uint64_t) 1000;
+						(const void **)&samplerate);
+				limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
 			}
 			if (limit_samples == 0) {
 				printf("Not enough time at this samplerate.\n");
@@ -1003,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;
 		}
@@ -1012,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;
 		}