Add SR_ prefix to the KHZ/MHZ/GHZ macros.

[libsigrok.git] / sigrok-internal.h

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 3de444e882c0a625fb04f1e44990657dd60bf0bc..a5326d2b9f57304ca85e82e7b77e09b0bbc52a8b 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -20,6 +20,20 @@
 #ifndef SIGROK_SIGROK_INTERNAL_H
 #define SIGROK_SIGROK_INTERNAL_H
 
+/*--- 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
+
+/*--- hwplugin.c ------------------------------------------------------------*/
+
+int load_hwplugins(void);
+
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
 GSList *list_serial_ports(void);
@@ -35,18 +49,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 ------------------------------------------------*/
 
+#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 sr_device_instance **sdi, libusb_device *dev,
             struct libusb_device_descriptor *des,
             uint16_t vid, uint16_t pid, int interface);
+#endif
 
 #endif