sr: session: Make most functions return int.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index 929b5c3f402daf59291dc44a557751497cd61104..b341efa1b07d63c758deb59d88badb440133c9d3 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -54,7 +54,8 @@ extern "C" {
 #define SR_ERR               -1 /* Generic/unspecified error */
 #define SR_ERR_MALLOC        -2 /* Malloc/calloc/realloc error */
 #define SR_ERR_ARG           -3 /* Function argument error */
-#define SR_ERR_SAMPLERATE    -4 /* Incorrect samplerate */
+#define SR_ERR_BUG           -4 /* Errors hinting at internal bugs */
+#define SR_ERR_SAMPLERATE    -5 /* Incorrect samplerate */
 
 #define SR_MAX_NUM_PROBES      64 /* Limited by uint64_t. */
 #define SR_MAX_PROBENAME_LEN   32
@@ -84,15 +85,6 @@ enum {
        SR_T_BOOL,
 };
 
-#if 0
-/* (Unused) protocol decoder stack entry */
-struct sr_protocol {
-       char *name;
-       int id;
-       int stackindex;
-};
-#endif
-
 /* sr_datafeed_packet.type values */
 enum {
        SR_DF_HEADER,
@@ -126,12 +118,6 @@ struct sr_datafeed_logic {
        void *data;
 };
 
-struct sr_datafeed_pd {
-       char *protocol;
-       char *annotation;
-       unsigned char *data;
-};
-
 #if defined(HAVE_LA_ALSA)
 struct sr_analog_probe {
        uint8_t att;
@@ -177,17 +163,6 @@ struct sr_output_format {
                      uint64_t *length_out);
 };
 
-#if 0
-struct sr_analyzer {
-       char *name;
-       char *filename;
-       /*
-        * TODO: Parameters? If so, configured plugins need another struct.
-        * TODO: Input and output format?
-        */
-};
-#endif
-
 struct sr_datastore {
        /* Size in bytes of the number of units stored in this datastore */
        int ds_unitsize;
@@ -225,9 +200,6 @@ struct sr_probe {
        char *trigger;
 };
 
-/* TODO: Get rid of this global variable. */
-extern GSList *devices;
-
 /* Hardware plugin capabilities */
 enum {
        SR_HWCAP_DUMMY,             /* Used to terminate lists */
@@ -358,6 +330,8 @@ enum {
        SR_DI_INSTANCE,
        /* The number of probes connected to this device */
        SR_DI_NUM_PROBES,
+       /* The probe names on this device */
+       SR_DI_PROBE_NAMES,
        /* Samplerates supported by this device, (struct sr_samplerates) */
        SR_DI_SAMPLERATES,
        /* Types of trigger supported, out of "01crf" (char *) */