fix hex output

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 496f1c6c997891a7dc05f2bae67edae997aff92d..26bf9fcc089bf0068e135027fc83d5cd76c159ee 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -123,15 +123,16 @@ struct datafeed_header {
 
 struct input {
        struct input_format *format;
-       void *param;
-       void *internal;
+       char *param;
+       struct device *vdevice;
 };
 
 struct input_format {
        char *extension;
        char *description;
        int (*format_match) (const char *filename);
-       int (*in_loadfile) (const char *filename);
+       int (*init) (struct input *in);
+       int (*loadfile) (struct input *in, const char *filename);
 };
 
 
@@ -212,10 +213,16 @@ extern GSList *devices;
 /* Hardware plugin capabilities */
 enum {
        HWCAP_DUMMY,             /* Used to terminate lists */
+       /* device classes */
        HWCAP_LOGIC_ANALYZER,
+
+       /* device options */
        HWCAP_SAMPLERATE,        /* Change samplerate */
        HWCAP_PROBECONFIG,       /* Configure probe mask */
        HWCAP_CAPTURE_RATIO,     /* Set pre/post-trigger capture ratio */
+       HWCAP_PATTERN_MODE,      /* Pattern generator mode */
+
+       /* acquisition modes */
        HWCAP_LIMIT_MSEC,        /* Set a time limit for sample acquisition */
        HWCAP_LIMIT_SAMPLES,     /* Set a limit on number of samples */
        HWCAP_CONTINUOUS,
@@ -288,6 +295,8 @@ enum {
        DI_TRIGGER_TYPES,
        /* The currently set samplerate in Hz (uint64_t) */
        DI_CUR_SAMPLERATE,
+       /* Supported pattern generator modes */
+       DI_PATTERNMODES,
 };
 
 /*
@@ -338,4 +347,5 @@ struct session {
 };
 
 #include "sigrok-proto.h"
+
 #endif