serial-dmm: Avoid duplicate symbol error

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index fa79110187df8a8b008a69871ac6dcec6216d6c0..d9f2bcd8a33c4aae06b9bb4660ff1c40a950e3ed 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -76,6 +76,7 @@ struct sr_serial_dev_inst {
 
 /* Private driver context. */
 struct drv_context {
+       struct sr_context *sr_ctx;
        GSList *instances;
 };
 
@@ -164,7 +165,7 @@ 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
 
@@ -207,7 +208,7 @@ SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
 
 /*--- hardware/common/dmm/rs9lcd.c ------------------------------------------*/
 
-#define RS_22_812_PACKET_SIZE  9
+#define RS9LCD_PACKET_SIZE 9
 
 SR_PRIV gboolean sr_rs9lcd_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,