X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=c63dcd46b858e2a52e11ccb1bab4ffb322422854;hb=b87f8504dc82eab0155263887662ac14c252414d;hp=bfe1abe6c04f75253de0ebae920df19ff0f53fba;hpb=b19f4622b6a1d21b00bd93d99e10bb4565ed7af0;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index bfe1abe6..c63dcd46 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -136,7 +136,7 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 			      int stopbits, int flowcontrol);
 SR_PRIV int serial_set_paramstr(int fd, const char *paramstr);
 SR_PRIV int serial_readline(int fd, char **buf, int *buflen,
-			    uint64_t timeout_ms);
+			    gint64 timeout_ms);
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/
 
@@ -148,6 +148,13 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 				  const char *filename);
 #endif
 
+/*--- hardware/common/usb.c -------------------------------------------------*/
+
+#ifdef HAVE_LIBUSB_1_0
+SR_PRIV GSList *sr_usb_connect(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/fs9922.c ------------------------------------------*/
 
 SR_PRIV int sr_dmm_parse_fs9922(const uint8_t *buf, float *floatval,