Move most contrib/ stuff to libsigrok.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index eda52b442e33fdbc27fe3d0bb9a8b216b860f1e5..605aece4389e880a4516300ad69255d681f825b8 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -33,11 +33,6 @@
 extern "C" {
 #endif
 
-#define SIGROK_MAJOR_VERSION @SIGROK_MAJOR_VERSION@
-#define SIGROK_MINOR_VERSION @SIGROK_MINOR_VERSION@
-#define SIGROK_MICRO_VERSION @SIGROK_MICRO_VERSION@
-#define SIGROK_VERSION       "@SIGROK_VERSION@"
-
 /*
  * Status/error codes returned by libsigrok functions.
  *
@@ -86,7 +81,7 @@ 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
@@ -230,9 +225,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 */
@@ -363,6 +355,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 *) */