udev: Add missing USB IDs for some devices.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index b3ca41aece36fec81508c22ecba6d1e2b7b925cb..2e888ccafa13e72c434bc8a0f977a26aaea24afd 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -81,18 +81,9 @@ typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 enum {
        SR_T_UINT64,
        SR_T_CHAR,
-       SR_T_NULL,
+       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,
@@ -177,17 +168,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 +205,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 +335,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 *) */