output modules now register the DF type they can use

diff --git a/output/output_binary.c b/output/output_binary.c
index 2045a579ec02a4579b961c03957583d947a6256a..41a8caee721ec04cb2eefec58285f9537c9311b9 100644 (file)
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -64,6 +64,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 struct output_format output_binary = {
        "binary",
        "Raw binary",
+       DF_LOGIC,
        NULL,
        data,
        event,

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 51648c4475be90b85a7183d677c13869381bc072..94c566faf1bc0cbd71151f63e12217452ada02f3 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -193,6 +193,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 struct output_format output_gnuplot = {
        "gnuplot",
        "Gnuplot",
+       DF_LOGIC,
        init,
        data,
        event,

diff --git a/output/output_skeleton.c b/output/output_skeleton.c
index d96d41ab4e34f261da5785ed5bd2dadaba2470e4..91ee9171e73c1a522b2c9995d6f57e36ba2c2254 100644 (file)
--- a/output/output_skeleton.c
+++ b/output/output_skeleton.c
@@ -40,6 +40,7 @@ static int event(struct output *o, int event_type, char **data_out,
 struct output_format output_foo = {
        "foo",
        "The foo format",
+       DF_LOGIC,
        init,
        data,
        event,

diff --git a/output/output_text.c b/output/output_text.c
index 79ec794ec0a3cf9df30cab74359c0dd549d6639f..cc3cb4e19a406e413f4542bdc09fd1689851fc6c 100644 (file)
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -307,6 +307,7 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 struct output_format output_text_bits = {
        "bits",
        "Text (bits)",
+       DF_LOGIC,
        init_bits,
        data_bits,
        event,
@@ -315,6 +316,7 @@ struct output_format output_text_bits = {
 struct output_format output_text_hex = {
        "hex",
        "Text (hexadecimal)",
+       DF_LOGIC,
        init_hex,
        data_hex,
        event,

diff --git a/output/output_vcd.c b/output/output_vcd.c
index eea2f0e5bcd1997ee21b28f86e8f8a8bfe0d0110..190e9e4561fa47c44baa6a788dddc6b9690572a9 100644 (file)
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -217,6 +217,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 struct output_format output_vcd = {
        "vcd",
        "Value Change Dump (VCD)",
+       DF_LOGIC,
        init,
        data,
        event,

diff --git a/sigrok.h b/sigrok.h
index ddfa4034848e7078c7589a8e665a7a4af40c59de..be82f4b5fb92849a3d6d0efd10ec7c727c47b847 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -95,7 +95,6 @@ enum {
        DF_TRIGGER,
        DF_LOGIC,
        DF_PD,
-       DF_PA,
 };
 
 struct datafeed_packet {
@@ -145,6 +144,7 @@ struct output {
 struct output_format {
        char *extension;
        char *description;
+       int df_type;
        int (*init) (struct output *o);
        int (*data) (struct output *o, char *data_in, uint64_t length_in,
                     char **data_out, uint64_t *length_out);