X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Foutput_analog.c;h=5118b5ae5fdbe839c13dbd2a13531a1df89d6aa1;hb=cdb3573ceba61b02b80f7fc979d166db5b6ff3bc;hp=b68f60faf1767b9f53be08afebac067e3df77b0f;hpb=6eb0e3ea9528e91ef1e44e224fe9d6b05e31596f;p=libsigrok.git

diff --git a/output/output_analog.c b/output/output_analog.c
index b68f60fa..5118b5ae 100644
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -48,7 +48,7 @@ struct context {
 	uint8_t *linevalues;
 	char *header;
 	int mark_trigger;
-//	struct analog_sample *prevsample;
+//	struct sr_analog_sample *prevsample;
 	enum outputmode mode;
 };
 
@@ -89,17 +89,17 @@ static void flush_linebufs(struct context *ctx, char *outbuf)
 	memset(ctx->linebuf, 0, i * ctx->linebuf_len);
 }
 
-static int init(struct output *o, int default_spl, enum outputmode mode)
+static int init(struct sr_output *o, int default_spl, enum outputmode mode)
 {
 	struct context *ctx;
-	struct probe *probe;
+	struct sr_probe *probe;
 	GSList *l;
 	uint64_t samplerate;
 	int num_probes;
 	char *samplerate_s;
 
 	if (!(ctx = calloc(1, sizeof(struct context))))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	o->internal = ctx;
 	ctx->num_enabled_probes = 0;
@@ -112,8 +112,8 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
 	}
 
 	ctx->probelist[ctx->num_enabled_probes] = 0;
-	ctx->unitsize = sizeof(struct analog_sample) +
-		(ctx->num_enabled_probes * sizeof(struct analog_probe));
+	ctx->unitsize = sizeof(struct sr_analog_sample) +
+		(ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
 	ctx->line_offset = 0;
 	ctx->spl_cnt = 0;
 	ctx->mark_trigger = -1;
@@ -122,24 +122,24 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
 	if (o->param && o->param[0]) {
 		ctx->samples_per_line = strtoul(o->param, NULL, 10);
 		if (ctx->samples_per_line < 1)
-			return SIGROK_ERR;
+			return SR_ERR;
 	} else
 		ctx->samples_per_line = default_spl;
 
 	if (!(ctx->header = malloc(512))) {
 		free(ctx);
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 	}
 
 	snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
 	num_probes = g_slist_length(o->device->probes);
-	if (o->device->plugin) {
+	if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
 		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, DI_CUR_SAMPLERATE));
-		if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
+				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+		if (!(samplerate_s = sr_samplerate_string(samplerate))) {
 			free(ctx->header);
 			free(ctx);
-			return SIGROK_ERR;
+			return SR_ERR;
 		}
 		snprintf(ctx->header + strlen(ctx->header),
 			 511 - strlen(ctx->header),
@@ -152,18 +152,18 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
 	if (!(ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len))) {
 		free(ctx->header);
 		free(ctx);
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 	}
 	if (!(ctx->linevalues = calloc(1, num_probes))) {
 		free(ctx->header);
 		free(ctx);
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 	}
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-static int event(struct output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, char **data_out,
 		 uint64_t *length_out)
 {
 	struct context *ctx;
@@ -172,16 +172,16 @@ static int event(struct output *o, int event_type, char **data_out,
 
 	ctx = o->internal;
 	switch (event_type) {
-	case DF_TRIGGER:
+	case SR_DF_TRIGGER:
 		ctx->mark_trigger = ctx->spl_cnt;
 		*data_out = NULL;
 		*length_out = 0;
 		break;
-	case DF_END:
+	case SR_DF_END:
 		outsize = ctx->num_enabled_probes
 				* (ctx->samples_per_line + 20) + 512;
 		if (!(outbuf = calloc(1, outsize)))
-			return SIGROK_ERR_MALLOC;
+			return SR_ERR_MALLOC;
 		flush_linebufs(ctx, outbuf);
 		*data_out = outbuf;
 		*length_out = strlen(outbuf);
@@ -194,25 +194,25 @@ static int event(struct output *o, int event_type, char **data_out,
 		break;
 	}
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-static int init_bits(struct output *o)
+static int init_bits(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-static int data_bits(struct output *o, char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out)
+static int data_bits(struct sr_output *o, const char *data_in,
+		     uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
 	int max_linelen;
-	struct analog_sample *sample;
+	struct sr_analog_sample *sample;
 	char *outbuf, c;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for
@@ -222,7 +222,7 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
             * (ctx->num_enabled_probes * max_linelen);
 
 	if (!(outbuf = calloc(1, outsize + 1)))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -239,7 +239,7 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
 	if (length_in >= ctx->unitsize) {
 		for (offset = 0; offset <= length_in - ctx->unitsize;
 		     offset += ctx->unitsize) {
-			sample = (struct analog_sample *) (data_in + offset);
+			sample = (struct sr_analog_sample *) (data_in + offset);
 			for (p = 0; p < ctx->num_enabled_probes; p++) {
 				int val = sample->probes[p].val;
 				int res = sample->probes[p].res;
@@ -280,16 +280,16 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
 	*data_out = outbuf;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 #if 0
-static int init_hex(struct output *o)
+static int init_hex(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-static int data_hex(struct output *o, char *data_in, uint64_t length_in,
-		    char **data_out, uint64_t *length_out)
+static int data_hex(struct sr_output *o, const char *data_in,
+		    uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -298,13 +298,13 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 2;
 	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
 			/ ctx->samples_per_line * max_linelen + 512;
 
 	if (!(outbuf = calloc(1, outsize + 1)))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -345,16 +345,16 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	*data_out = outbuf;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-static int init_ascii(struct output *o)
+static int init_ascii(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out)
+static int data_ascii(struct sr_output *o, const char *data_in,
+		      uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -363,7 +363,7 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for
@@ -373,7 +373,7 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
             * (ctx->num_enabled_probes * max_linelen);
 
 	if (!(outbuf = calloc(1, outsize + 1)))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -434,34 +434,34 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
 	*data_out = outbuf;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 #endif
 
-struct output_format output_analog_bits = {
-	"analog_bits",
-	"Bits (takes argument, default 64)",
-	DF_ANALOG,
-	init_bits,
-	data_bits,
-	event,
+struct sr_output_format output_analog_bits = {
+	.id = "analog_bits",
+	.description = "Bits (takes argument, default 64)",
+	.df_type = SR_DF_ANALOG,
+	.init = init_bits,
+	.data = data_bits,
+	.event = event,
 };
 #if 0
-struct output_format output_analog_hex = {
-	"analog_hex",
-	"Hexadecimal (takes argument, default 192)",
-	DF_ANALOG,
-	init_hex,
-	data_hex,
-	event,
+struct sr_output_format output_analog_hex = {
+	.id = "analog_hex",
+	.description = "Hexadecimal (takes argument, default 192)",
+	.df_type = SR_DF_ANALOG,
+	.init = init_hex,
+	.data = data_hex,
+	.event = event,
 };
 
-struct output_format output_analog_ascii = {
-	"analog_ascii",
-	"ASCII (takes argument, default 74)",
-	DF_ANALOG,
-	init_ascii,
-	data_ascii,
-	event,
+struct sr_output_format output_analog_ascii = {
+	.id = "analog_ascii",
+	.description = "ASCII (takes argument, default 74)",
+	.df_type = SR_DF_ANALOG,
+	.init = init_ascii,
+	.data = data_ascii,
+	.event = event,
 };
 #endif