#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "output/csv: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
struct context {
unsigned int num_enabled_probes;
struct sr_probe *probe;
GSList *l;
int num_probes;
- uint64_t samplerate;
+ uint64_t *samplerate;
time_t t;
unsigned int i;
if (!o) {
- sr_err("csv out: %s: o was NULL", __func__);
+ sr_err("%s: o was NULL", __func__);
return SR_ERR_ARG;
}
- if (!o->device) {
- sr_err("csv out: %s: o->device was NULL", __func__);
+ if (!o->sdi) {
+ sr_err("%s: o->sdi was NULL", __func__);
return SR_ERR_ARG;
}
- if (!o->device->plugin) {
- sr_err("csv out: %s: o->device->plugin was NULL", __func__);
+ if (!o->sdi->driver) {
+ sr_err("%s: o->sdi->driver was NULL", __func__);
return SR_ERR_ARG;
}
if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
- sr_err("csv out: %s: ctx malloc failed", __func__);
+ sr_err("%s: ctx malloc failed", __func__);
return SR_ERR_MALLOC;
}
o->internal = ctx;
/* Get the number of probes, their names, and the unitsize. */
- /* TODO: Error handling. */
- for (l = o->device->probes; l; l = l->next) {
+ for (l = o->sdi->probes; l; l = l->next) {
probe = l->data;
if (!probe->enabled)
continue;
ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
- num_probes = g_slist_length(o->device->probes);
+ num_probes = g_slist_length(o->sdi->probes);
- if (sr_device_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. */
- } else {
- samplerate = 0; /* TODO: Error or set some value? */
- }
- ctx->samplerate = samplerate;
+ if (sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) {
+ o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
+ (const void **)&samplerate, o->sdi);
+ ctx->samplerate = *samplerate;
+ } else
+ ctx->samplerate = 0;
ctx->separator = ',';
-
ctx->header = g_string_sized_new(512);
t = time(NULL);
g_string_append_printf(ctx->header, "%s, ", ctx->probelist[i]);
g_string_append_printf(ctx->header, "\n");
- return 0; /* TODO: SR_OK? */
+ return SR_OK;
}
-static int event(struct sr_output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, uint8_t **data_out,
uint64_t *length_out)
{
struct context *ctx;
if (!o) {
- sr_err("csv out: %s: o was NULL", __func__);
+ sr_err("%s: o was NULL", __func__);
return SR_ERR_ARG;
}
if (!(ctx = o->internal)) {
- sr_err("csv out: %s: o->internal was NULL", __func__);
+ sr_err("%s: o->internal was NULL", __func__);
return SR_ERR_ARG;
}
if (!data_out) {
- sr_err("csv out: %s: data_out was NULL", __func__);
+ sr_err("%s: data_out was NULL", __func__);
return SR_ERR_ARG;
}
switch (event_type) {
case SR_DF_TRIGGER:
- sr_dbg("csv out: %s: SR_DF_TRIGGER event", __func__);
+ sr_dbg("%s: SR_DF_TRIGGER event", __func__);
/* TODO */
*data_out = NULL;
*length_out = 0;
break;
case SR_DF_END:
- sr_dbg("csv out: %s: SR_DF_END event", __func__);
+ sr_dbg("%s: SR_DF_END event", __func__);
/* TODO */
*data_out = NULL;
*length_out = 0;
o->internal = NULL;
break;
default:
- sr_err("csv out: %s: unsupported event type: %d", __func__,
- event_type);
+ sr_err("%s: unsupported event type: %d", __func__, event_type);
*data_out = NULL;
*length_out = 0;
break;
return SR_OK;
}
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+static int data(struct sr_output *o, const uint8_t *data_in,
+ uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
{
struct context *ctx;
GString *outstr;
int j;
if (!o) {
- sr_err("csv out: %s: o was NULL", __func__);
+ sr_err("%s: o was NULL", __func__);
return SR_ERR_ARG;
}
if (!(ctx = o->internal)) {
- sr_err("csv out: %s: o->internal was NULL", __func__);
+ sr_err("%s: o->internal was NULL", __func__);
return SR_ERR_ARG;
}
if (!data_in) {
- sr_err("csv out: %s: data_in was NULL", __func__);
+ sr_err("%s: data_in was NULL", __func__);
return SR_ERR_ARG;
}
g_string_append_printf(outstr, "\n");
}
- *data_out = outstr->str;
+ *data_out = (uint8_t *)outstr->str;
*length_out = outstr->len;
g_string_free(outstr, FALSE);
return SR_OK;
}
-struct sr_output_format output_csv = {
+SR_PRIV struct sr_output_format output_csv = {
.id = "csv",
.description = "Comma-separated values (CSV)",
.df_type = SR_DF_LOGIC,
projects / libsigrok.git / blobdiff