X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=f78be464fd76a071225ae4ff3dd63ddfae06d715;hb=15278f3e9cf4c4a4a6c331e042f9935709343c82;hp=bf806313877f01a25f0e4889274dfbab7ba41149;hpb=058b70353dd462ab13f3badb43f2fea697161bd7;p=libsigrok.git diff --git a/sigrok-internal.h b/sigrok-internal.h index bf806313..f78be464 100644 --- a/sigrok-internal.h +++ b/sigrok-internal.h @@ -20,6 +20,35 @@ #ifndef SIGROK_SIGROK_INTERNAL_H #define SIGROK_SIGROK_INTERNAL_H +#include +#include + +/*--- Macros ----------------------------------------------------------------*/ + +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#endif + +#ifndef ARRAY_AND_SIZE +#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a) +#endif + +/* Size of a datastore chunk in units */ +#define DATASTORE_CHUNKSIZE 512000 + +/*--- hwplugin.c ------------------------------------------------------------*/ + +int load_hwplugins(void); + +/*--- log.c -----------------------------------------------------------------*/ + +int sr_log(int loglevel, const char *format, ...); +int sr_spew(const char *format, ...); +int sr_dbg(const char *format, ...); +int sr_info(const char *format, ...); +int sr_warn(const char *format, ...); +int sr_err(const char *format, ...); + /*--- hardware/common/serial.c ----------------------------------------------*/ GSList *list_serial_ports(void); @@ -35,18 +64,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