X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=b30d417dd1cda8e8154e020fda89708a2d2bdf30;hb=77b454421a2aa7d52873f036e5ba5f8030fe29a3;hp=bf806313877f01a25f0e4889274dfbab7ba41149;hpb=058b70353dd462ab13f3badb43f2fea697161bd7;p=libsigrok.git diff --git a/sigrok-internal.h b/sigrok-internal.h index bf806313..b30d417d 100644 --- a/sigrok-internal.h +++ b/sigrok-internal.h @@ -35,18 +35,22 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits, /*--- hardware/common/ezusb.c -----------------------------------------------*/ +#ifdef HAVE_LIBUSB_1_0 int ezusb_reset(struct libusb_device_handle *hdl, int set_clear); int ezusb_install_firmware(libusb_device_handle *hdl, char *filename); int ezusb_upload_firmware(libusb_device *dev, int configuration, const char *filename); +#endif /*--- hardware/common/misc.c ------------------------------------------------*/ -int opendev2(int device_index, struct sigrok_device_instance **sdi, +#ifdef HAVE_LIBUSB_1_0 +int opendev2(int device_index, struct sr_device_instance **sdi, libusb_device *dev, struct libusb_device_descriptor *des, int *skip, uint16_t vid, uint16_t pid, int interface); -int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev, +int opendev3(struct sr_device_instance **sdi, libusb_device *dev, struct libusb_device_descriptor *des, uint16_t vid, uint16_t pid, int interface); +#endif #endif