Use g_try_malloc/g_free/g_strdup consistently.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index 0b585c4e67b74e038dcfbd8d2226bfd4f39af872..5e42011cc81dd3c7368e7604d4acab8e9c7a6714 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_H
-#define SIGROK_SIGROK_H
+#ifndef LIBSIGROK_SIGROK_H
+#define LIBSIGROK_SIGROK_H
 
 #include <stdio.h>
 #include <sys/time.h>
@@ -66,12 +66,12 @@ extern "C" {
 #define SR_HZ_TO_NS(n) (1000000000 / (n))
 
 /* libsigrok loglevels. */
-#define SR_LOG_NONE     0
-#define SR_LOG_ERR      1
-#define SR_LOG_WARN     2
-#define SR_LOG_INFO     3
-#define SR_LOG_DBG      4
-#define SR_LOG_SPEW     5
+#define SR_LOG_NONE    0 /**< Output no messages at all. */
+#define SR_LOG_ERR     1 /**< Output error messages. */
+#define SR_LOG_WARN    2 /**< Output warnings. */
+#define SR_LOG_INFO    3 /**< Output informational messages. */
+#define SR_LOG_DBG     4 /**< Output debug messages. */
+#define SR_LOG_SPEW    5 /**< Output very noisy debug messages. */
 
 /*
  * Use SR_API to mark public API symbols, and SR_PRIV for private symbols.
@@ -107,7 +107,6 @@ enum {
        SR_DF_END,
        SR_DF_TRIGGER,
        SR_DF_LOGIC,
-       SR_DF_ANALOG,
        SR_DF_PD,
 };
 
@@ -120,7 +119,6 @@ struct sr_datafeed_header {
        int feed_version;
        struct timeval starttime;
        uint64_t samplerate;
-       int num_analog_probes;
        int num_logic_probes;
 };
 
@@ -188,7 +186,6 @@ struct sr_device {
 
 enum {
        SR_PROBE_TYPE_LOGIC,
-       SR_PROBE_TYPE_ANALOG,
 };
 
 struct sr_probe {