X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fchronovu_la8.c;h=bb7fe4e75516e74b88a398c9e463369c3c21ae29;hb=44dae539254e324e0330e194f9c775be3d761503;hp=6ef99dafbfc6621cb58d9f7c67385af8c840de16;hpb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95;p=libsigrok.git

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 6ef99daf..bb7fe4e7 100644
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -36,6 +36,7 @@ struct context {
  * Check if the given samplerate is supported by the LA8 hardware.
  *
  * @param samplerate The samplerate (in Hz) to check.
+ *
  * @return 1 if the samplerate is supported/valid, 0 otherwise.
  */
 static int is_valid_samplerate(uint64_t samplerate)
@@ -61,6 +62,7 @@ static int is_valid_samplerate(uint64_t samplerate)
  * Max. value for divcount: 0xfe (2550ns sample period, 392.15kHz samplerate).
  *
  * @param samplerate The samplerate in Hz.
+ *
  * @return The divcount value as needed by the hardware, or 0xff upon errors.
  */
 static uint8_t samplerate_to_divcount(uint64_t samplerate)
@@ -102,8 +104,8 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!(ctx = calloc(1, sizeof(struct context)))) {
-		sr_warn("la8 out: %s: ctx calloc failed", __func__);
+	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+		sr_warn("la8 out: %s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
@@ -122,7 +124,7 @@ static int init(struct sr_output *o)
 
 	num_probes = g_slist_length(o->device->probes);
 
-	if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
+	if (sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
 		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
 				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
 		/* TODO: Error checks. */
@@ -163,7 +165,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 		break;
 	case SR_DF_END:
 		sr_dbg("la8 out: %s: SR_DF_END event", __func__);
-		if (!(outbuf = malloc(4 + 1))) {
+		if (!(outbuf = g_try_malloc(4 + 1))) {
 			sr_warn("la8 out: %s: outbuf malloc failed", __func__);
 			return SR_ERR_MALLOC;
 		}
@@ -183,7 +185,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 
 		*data_out = outbuf;
 		*length_out = 4 + 1;
-		free(o->internal);
+		g_free(o->internal);
 		o->internal = NULL;
 		break;
 	default:
@@ -218,8 +220,8 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 		return SR_ERR_ARG;
 	}
 
-	if (!(outbuf = calloc(1, length_in))) {
-		sr_warn("la8 out: %s: outbuf calloc failed", __func__);
+	if (!(outbuf = g_try_malloc0(length_in))) {
+		sr_warn("la8 out: %s: outbuf malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}