Rename various *PROBE* macros to *CHANNEL*.

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 54b23e32913b45f7d3807f3644ea6f2b2ddce01e..4d508c5b11ca64343b8c3947e85bde73897523a4 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -227,12 +227,12 @@ SR_PRIV int sr_err(const char *format, ...);
 /** Values for the changes argument of sr_dev_driver.config_probe_set. */
 enum {
        /** The enabled state of the probe has been changed. */
-       SR_PROBE_SET_ENABLED = 1 << 0,
+       SR_CHANNEL_SET_ENABLED = 1 << 0,
        /** The trigger setup of the probe has been changed. */
-       SR_PROBE_SET_TRIGGER = 1 << 1,
+       SR_CHANNEL_SET_TRIGGER = 1 << 1,
 };
 
-SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
+SR_PRIV struct sr_channel *sr_channel_new(int index, int type,
                gboolean enabled, const char *name);
 
 /* Generic device instances */
@@ -591,7 +591,7 @@ struct metex14_info {
        gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad;
        gboolean is_hertz, is_ohm, is_celsius, is_pico, is_nano, is_micro;
        gboolean is_milli, is_kilo, is_mega, is_gain, is_decibel, is_hfe;
-       gboolean is_unitless;
+       gboolean is_unitless, is_logic;
 };
 
 #ifdef HAVE_LIBSERIALPORT