* This file is part of the sigrok project.
*
* Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <glib.h>
#include "sigrok.h"
#include "sigrok-internal.h"
-#include "config.h"
struct context {
GString *header;
}
ctx->unitsize = (num_enabled_probes + 7) / 8;
- if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE))
+ if (o->device->plugin && 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));
else
ctx = o->internal;
if (ctx && event_type == SR_DF_END) {
- if (ctx->header)
- g_string_free(ctx->header, TRUE);
- free(o->internal);
+ g_string_free(ctx->header, TRUE);
+ g_free(o->internal);
o->internal = NULL;
}
return SR_OK;
}
-struct sr_output_format output_ols = {
+SR_PRIV struct sr_output_format output_ols = {
.id = "ols",
.description = "OpenBench Logic Sniffer",
.df_type = SR_DF_LOGIC,