Rename a few more API calls with 'probe' in their name.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 9c69474e3f0f3260811f4a3286eb6cb565b728ae..8df2f396ab15ed6f90614672cc7f74602378a663 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -81,7 +81,7 @@ enum {
         */
 };
 
-#define SR_MAX_PROBENAME_LEN 32
+#define SR_MAX_CHANNELNAME_LEN 32
 
 /* Handy little macros */
 #define SR_HZ(n)  (n)
@@ -600,16 +600,16 @@ struct sr_output_format {
 /** Constants for probe type. */
 enum {
        /** Probe type is logic probe. */
-    SR_PROBE_LOGIC = 10000,
+    SR_CHANNEL_LOGIC = 10000,
        /** Probe type is analog probe. */
-    SR_PROBE_ANALOG,
+    SR_CHANNEL_ANALOG,
 };
 
 /** Information on single channel. */
 struct sr_channel {
        /** Number of channels, starting at 0. */
        int index;
-       /** Channel type (SR_PROBE_LOGIC, ...) */
+       /** Channel type (SR_CHANNEL_LOGIC, ...) */
        int type;
        /** Is this channel enabled? */
        gboolean enabled;
@@ -804,10 +804,10 @@ enum {
        SR_CONF_CENTER_FREQUENCY,
 
        /** The device supports setting the number of logic probes. */
-       SR_CONF_NUM_LOGIC_PROBES,
+       SR_CONF_NUM_LOGIC_CHANNELS,
 
        /** The device supports setting the number of analog probes. */
-       SR_CONF_NUM_ANALOG_PROBES,
+       SR_CONF_NUM_ANALOG_CHANNELS,
 
        /** Output voltage. */
        SR_CONF_OUTPUT_VOLTAGE,
@@ -993,8 +993,8 @@ struct sr_dev_driver {
                        const struct sr_dev_inst *sdi,
                        const struct sr_channel_group *cg);
        /** Probe status change.
-        *  @see sr_dev_probe_enable(), sr_dev_trigger_set(). */
-       int (*config_probe_set) (const struct sr_dev_inst *sdi,
+        *  @see sr_dev_channel_enable(), sr_dev_trigger_set(). */
+       int (*config_channel_set) (const struct sr_dev_inst *sdi,
                        struct sr_channel *ch, unsigned int changes);
        /** Apply configuration settings to the device hardware.
         *  @see sr_config_commit().*/