X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=5cbe845ce20aa7ba3408bcddafd0cbb74f7820c4;hb=29d957ceae3bd9ac5b72cd0e58a5910932bd1768;hp=ddb4f995e8c4787b4d7a71ca4c860082af444cc9;hpb=1ebe4b4e6926eb1288ce77b179a92bc670eb9eca;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index ddb4f995..5cbe845c 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -103,6 +103,7 @@ 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
 
@@ -122,7 +123,7 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 /*--- session.c -------------------------------------------------------------*/
 
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
-			    struct sr_datafeed_packet *packet);
+			    const struct sr_datafeed_packet *packet);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
@@ -165,10 +166,27 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 /*--- hardware/common/usb.c -------------------------------------------------*/
 
 #ifdef HAVE_LIBUSB_1_0
-SR_PRIV GSList *sr_usb_connect(libusb_context *usb_ctx, const char *conn);
+SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn);
 SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
 #endif
 
+/*--- hardware/common/dmm/es51922.c -----------------------------------------*/
+
+#define ES51922_PACKET_SIZE 14
+
+struct es51922_info {
+	gboolean is_judge, is_vbar, is_voltage, is_auto, is_micro, is_current;
+	gboolean is_milli, is_resistance, is_continuity, is_diode, is_lpf;
+	gboolean is_frequency, is_duty_cycle, is_capacitance, is_temperature;
+	gboolean is_celsius, is_fahrenheit, is_adp, is_sign, is_batt, is_ol;
+	gboolean is_max, is_min, is_rel, is_rmr, is_ul, is_pmax, is_pmin;
+	gboolean is_dc, is_ac, is_vahz, is_hold, is_nano, is_kilo, is_mega;
+};
+
+SR_PRIV gboolean sr_es51922_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_es51922_parse(const uint8_t *buf, float *floatval,
+			     struct sr_datafeed_analog *analog, void *info);
+
 /*--- hardware/common/dmm/fs9922.c ------------------------------------------*/
 
 SR_PRIV int sr_dmm_parse_fs9922(const uint8_t *buf, float *floatval,
@@ -210,6 +228,9 @@ SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
 
 #define RS9LCD_PACKET_SIZE 9
 
+/* Dummy info struct. The parser does not use it. */
+struct rs9lcd_info {};
+
 SR_PRIV gboolean sr_rs9lcd_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
 			    struct sr_datafeed_analog *analog, void *info);