struct context {
unsigned int num_enabled_probes;
unsigned int unitsize;
- char *probelist[MAX_NUM_PROBES+1];
+ char *probelist[SR_MAX_NUM_PROBES + 1];
char *header;
};
-#define MAX_HEADER_LEN 1024 + (MAX_NUM_PROBES * (MAX_PROBENAME_LEN + 10))
-const char *gnuplot_header = "\
+#define MAX_HEADER_LEN \
+ (1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10)))
+
+static const char *gnuplot_header = "\
# Sample data in space-separated columns format usable by gnuplot\n\
#\n\
# Generated by: %s on %s%s\
----------------------------------------\n\
# 0\t\tSample counter (for internal gnuplot purposes)\n%s\n";
-const char *gnuplot_header_comment = "\
+static const char *gnuplot_header_comment = "\
# Comment: Acquisition with %d/%d probes at %s\n";
static int init(struct sr_output *o)
{
struct context *ctx;
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
uint64_t samplerate;
unsigned int i;
num_probes = g_slist_length(o->device->probes);
comment[0] = '\0';
- 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, SR_DI_CUR_SAMPLERATE));
if (!(frequency_s = sr_samplerate_string(samplerate))) {
return SR_OK;
}
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out)
{
struct context *ctx;
return SR_OK;
}
+struct sr_output_format output_gnuplot = {
+ "gnuplot",
+ "Gnuplot",
+ SR_DF_LOGIC,
+ init,
+ data,
+ event,
+};
+
+/* Temporarily disabled. */
+#if 0
static int analog_init(struct sr_output *o)
{
struct context *ctx;
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
uint64_t samplerate;
unsigned int i;
}
ctx->probelist[ctx->num_enabled_probes] = 0;
// ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
- 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));
num_probes = g_slist_length(o->device->probes);
comment[0] = '\0';
- 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, SR_DI_CUR_SAMPLERATE));
if (!(frequency_s = sr_samplerate_string(samplerate))) {
// uint64_t sample;
static uint64_t samplecount = 0;
char *outbuf, *c;
- struct analog_sample *sample;
+ struct sr_analog_sample *sample;
ctx = o->internal;
// max_linelen = 16 + ctx->num_enabled_probes * 2;
for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
// memcpy(&sample, data_in + i, ctx->unitsize);
- sample = (struct analog_sample *) (data_in + i);
+ sample = (struct sr_analog_sample *) (data_in + i);
/* The first column is a counter (needed for gnuplot). */
c = outbuf + strlen(outbuf);
return SR_OK;
}
-struct sr_output_format output_gnuplot = {
- "gnuplot",
- "Gnuplot",
- SR_DF_LOGIC,
- init,
- data,
- event,
-};
-
struct sr_output_format output_analog_gnuplot = {
"analog_gnuplot",
"Gnuplot analog",
analog_data,
event,
};
+#endif