Support for analog probes

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 16a415704b51aa453854c2544c64cd4ee96c13c2..5606a1e5f118e94132fb8009804e8bbe398f7844 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -94,8 +94,8 @@ enum {
        DF_END,
        DF_TRIGGER,
        DF_LOGIC,
+       DF_ANALOG,
        DF_PD,
-       DF_PA,
 };
 
 struct datafeed_packet {
@@ -110,7 +110,8 @@ struct datafeed_header {
        struct timeval starttime;
        uint64_t samplerate;
        int protocol_id;
-       int num_probes;
+       int num_analog_probes;
+       int num_logic_probes;
 };
 
 /*
@@ -145,6 +146,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);
@@ -218,8 +220,14 @@ struct device {
        struct datastore *datastore;
 };
 
+enum {
+       PROBE_TYPE_LOGIC,
+       PROBE_TYPE_ANALOG,
+};
+
 struct probe {
        int index;
+       int type;
        gboolean enabled;
        char *name;
        char *trigger;
@@ -269,6 +277,7 @@ struct sigrok_device_instance {
        char *vendor;
        char *model;
        char *version;
+       void *priv;
        union {
                struct usb_device_instance *usb;
                struct serial_device_instance *serial;