X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=89bedde1dabb6c5b3f4cdd9f5241f3ff3cae72e5;hb=9503583268cb322dc67b0e11d928739cbdcdb342;hp=90e40342518d3da1c41dddf2338333d74cb1ced3;hpb=b541f8376d8fadb1377e3140c3d79304f5d680ec;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 90e40342..89bedde1 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -224,15 +224,15 @@ SR_PRIV int sr_err(const char *format, ...);
 
 /*--- device.c --------------------------------------------------------------*/
 
-/** Values for the changes argument of sr_dev_driver.config_probe_set. */
+/** Values for the changes argument of sr_dev_driver.config_channel_set. */
 enum {
-	/** The enabled state of the probe has been changed. */
-	SR_PROBE_SET_ENABLED = 1 << 0,
-	/** The trigger setup of the probe has been changed. */
-	SR_PROBE_SET_TRIGGER = 1 << 1,
+	/** The enabled state of the channel has been changed. */
+	SR_CHANNEL_SET_ENABLED = 1 << 0,
+	/** The trigger setup of the channel has been changed. */
+	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 */
@@ -244,7 +244,6 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi);
 /* USB-specific instances */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 		uint8_t address, struct libusb_device_handle *hdl);
-SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx);
 SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb);
 #endif
 
@@ -592,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