X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=strutil.c;h=57b4aa88e4532133f9409d0d46a41410ea668605;hb=f92994fd9174bc423e58c21eda83633afc9513da;hp=9cd194ede5257722e4f971afb4554923251b4386;hpb=44dae539254e324e0330e194f9c775be3d761503;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 9cd194ed..57b4aa88 100644
--- a/strutil.c
+++ b/strutil.c
@@ -27,7 +27,8 @@
 /**
  * Convert a numeric samplerate value to its "natural" string representation.
  *
- * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz".
+ * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz",
+ * 31500 would become "31.5 kHz".
  *
  * @param samplerate The samplerate in Hz.
  *
@@ -38,26 +39,30 @@
 SR_API char *sr_samplerate_string(uint64_t samplerate)
 {
 	char *o;
-	int r;
+	uint64_t s = samplerate;
 
-	/* Allocate enough for a uint64_t as string + " GHz". */
-	if (!(o = g_try_malloc0(30 + 1))) {
-		sr_err("strutil: %s: o malloc failed", __func__);
-		return NULL;
+	if ((s >= SR_GHZ(1)) && (s % SR_GHZ(1) == 0)) {
+		o = g_strdup_printf("%" PRIu64 " GHz", s / SR_GHZ(1));
+	} else if ((s >= SR_GHZ(1)) && (s % SR_GHZ(1) != 0)) {
+		o = g_strdup_printf("%" PRIu64 ".%" PRIu64 " GHz",
+				    s / SR_GHZ(1), s % SR_GHZ(1));
+	} else if ((s >= SR_MHZ(1)) && (s % SR_MHZ(1) == 0)) {
+		o = g_strdup_printf("%" PRIu64 " MHz", s / SR_MHZ(1));
+	} else if ((s >= SR_MHZ(1)) && (s % SR_MHZ(1) != 0)) {
+		o = g_strdup_printf("%" PRIu64 ".%" PRIu64 " MHz",
+				    s / SR_MHZ(1), s % SR_MHZ(1));
+	} else if ((s >= SR_KHZ(1)) && (s % SR_KHZ(1) == 0)) {
+		o = g_strdup_printf("%" PRIu64 " kHz", s / SR_KHZ(1));
+	} else if ((s >= SR_KHZ(1)) && (s % SR_KHZ(1) != 0)) {
+		o = g_strdup_printf("%" PRIu64 ".%" PRIu64 " kHz",
+				    s / SR_KHZ(1), s % SR_KHZ(1));
+	} else {
+		o = g_strdup_printf("%" PRIu64 " Hz", s);
 	}
 
-	if (samplerate >= SR_GHZ(1))
-		r = snprintf(o, 30, "%" PRIu64 " GHz", samplerate / 1000000000);
-	else if (samplerate >= SR_MHZ(1))
-		r = snprintf(o, 30, "%" PRIu64 " MHz", samplerate / 1000000);
-	else if (samplerate >= SR_KHZ(1))
-		r = snprintf(o, 30, "%" PRIu64 " kHz", samplerate / 1000);
-	else
-		r = snprintf(o, 30, "%" PRIu64 " Hz", samplerate);
-
-	if (r < 0) {
-		/* Something went wrong... */
-		g_free(o);
+	if (!o) {
+		sr_err("strutil: %s: Error creating samplerate string.",
+		       __func__);
 		return NULL;
 	}
 
@@ -108,12 +113,12 @@ SR_API char *sr_period_string(uint64_t frequency)
 /**
  * TODO
  *
- * @param device TODO
+ * @param dev TODO
  * @param triggerstring TODO
  *
  * @return TODO
  */
-SR_API char **sr_parse_triggerstring(struct sr_device *device,
+SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 				     const char *triggerstring)
 {
 	GSList *l;
@@ -122,7 +127,7 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
 	char **tokens, **triggerlist, *trigger, *tc, *trigger_types;
 	gboolean error;
 
-	max_probes = g_slist_length(device->probes);
+	max_probes = g_slist_length(dev->probes);
 	error = FALSE;
 
 	if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
@@ -131,7 +136,7 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
 	}
 
 	tokens = g_strsplit(triggerstring, ",", max_probes);
-	trigger_types = device->plugin->get_device_info(0, SR_DI_TRIGGER_TYPES);
+	trigger_types = dev->driver->dev_info_get(0, SR_DI_TRIGGER_TYPES);
 	if (trigger_types == NULL)
 		return NULL;
 
@@ -139,7 +144,7 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
 		if (tokens[i][0] < '0' || tokens[i][0] > '9') {
 			/* Named probe */
 			probenum = 0;
-			for (l = device->probes; l; l = l->next) {
+			for (l = dev->probes; l; l = l->next) {
 				probe = (struct sr_probe *)l->data;
 				if (probe->enabled
 				    && !strncmp(probe->name, tokens[i],