X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fvcd.c;h=b97a4c38932e7e827edc883980bbda8f343f07cd;hb=f9592d65e9759b9a37c51a090c3504d4328ba4d4;hp=7403d575600862a7b180ec25dc3548997113ccdf;hpb=3cd4b381744eb88fd4ba32565bd408c33b431629;p=libsigrok.git
diff --git a/src/output/vcd.c b/src/output/vcd.c
index 7403d575..b97a4c38 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -15,15 +15,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
#include
#include
#include
-#include "config.h" /* Needed for PACKAGE and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/vcd"
@@ -104,7 +103,7 @@ static GString *gen_header(const struct sr_output *o)
/* generator */
g_string_append_printf(header, "$version %s %s $end\n",
- PACKAGE, PACKAGE_VERSION);
+ PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
g_string_append_printf(header, "$comment\n Acquisition with "
"%d/%d channels", ctx->num_enabled_channels, num_channels);
@@ -130,12 +129,12 @@ static GString *gen_header(const struct sr_output *o)
ctx->period = SR_MHZ(1);
else
ctx->period = SR_KHZ(1);
- frequency_s = sr_period_string(ctx->period);
+ frequency_s = sr_period_string(1, ctx->period);
g_string_append_printf(header, "$timescale %s $end\n", frequency_s);
g_free(frequency_s);
/* scope */
- g_string_append_printf(header, "$scope module %s $end\n", PACKAGE);
+ g_string_append_printf(header, "$scope module %s $end\n", PACKAGE_NAME);
/* Wires / channels */
for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {