Move most contrib/ stuff to libsigrok.

[libsigrok.git] / sigrok-internal.h

diff --git a/sigrok-internal.h b/sigrok-internal.h
index d385340357c551d6323105443d49970fd975beee..71325c273d79d58f77e409b175fecd6658fc1611 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -21,6 +21,7 @@
 #define SIGROK_SIGROK_INTERNAL_H
 
 #include <stdarg.h>
+#include <glib.h>
 
 /*--- Macros ----------------------------------------------------------------*/
 
@@ -41,14 +42,8 @@ int load_hwplugins(void);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-/* Log levels for sr_log() and friends. */
-#define SR_LOG_NONE    0
-#define SR_LOG_DBG     1
-#define SR_LOG_INFO    2
-#define SR_LOG_WARN    3
-#define SR_LOG_ERR     4
-
 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, ...);
@@ -71,7 +66,7 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
 
 #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_install_firmware(libusb_device_handle *hdl, const char *filename);
 int ezusb_upload_firmware(libusb_device *dev, int configuration,
                          const char *filename);
 #endif