Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 4373fcb497266c6663e64e059923fef8373daae7..59d6b1a3082978d361b7692ba67a892c7cf56f1b 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -60,6 +60,8 @@
 #define MHZ(n) ((n) * 1000000)
 #define GHZ(n) ((n) * 1000000000)
 
+#define HZ_TO_NS(n) (1000000000 / (n))
+
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #endif
@@ -113,7 +115,8 @@ struct datafeed_header {
        struct timeval starttime;
        uint64_t samplerate;
        int protocol_id;
-       int num_probes;
+       int num_analog_probes;
+       int num_logic_probes;
 };
 
 
@@ -190,8 +193,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;