In the lib, we should only #include "sigrok.h" or "sigrok-internal.h",
but not the (possibly installed and thus different/older versions) via
<sigrok.h> or <sigrok-internal.h>.
Frontends should of course use <sigrok.h> and <sigrok-internal.h>.
23 files changed:
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
+AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
SUBDIRS = hardware input output firmware
SUBDIRS = hardware input output firmware
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
/**
* Initialize libsigrok.
/**
* Initialize libsigrok.
#include <stdint.h>
#include <string.h>
#include <glib.h>
#include <stdint.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
static gpointer new_chunk(struct sr_datastore **ds);
static gpointer new_chunk(struct sr_datastore **ds);
#include <stdio.h>
#include <glib.h>
#include <stdio.h>
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
static GSList *devices = NULL;
static GSList *devices = NULL;
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include "sigrok-internal.h"
/**
#include "sigrok-internal.h"
/**
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
#include <alsa/asoundlib.h>
#include <alsa/asoundlib.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#define NUM_PROBES 2
#define SAMPLE_WIDTH 16
#define NUM_PROBES 2
#define SAMPLE_WIDTH 16
#include <ftdi.h>
#include <string.h>
#include <zlib.h>
#include <ftdi.h>
#include <string.h>
#include <zlib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "asix-sigma.h"
#define USB_VENDOR 0xa600
#include "asix-sigma.h"
#define USB_VENDOR 0xa600
#include <ftdi.h>
#include <glib.h>
#include <string.h>
#include <ftdi.h>
#include <glib.h>
#include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#define USB_VENDOR_ID 0x0403
#define USB_PRODUCT_ID 0x6001
#define USB_VENDOR_ID 0x0403
#define USB_PRODUCT_ID 0x6001
* Helper functions for the Cypress EZ-USB / FX2 series chips.
*/
* Helper functions for the Cypress EZ-USB / FX2 series chips.
*/
-#include <sigrok.h>
-#include <sigrok-internal.h>
#include <libusb.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <libusb.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <errno.h>
#include <string.h>
#include "config.h"
#include <errno.h>
#include <string.h>
#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
{
int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
{
#endif
#include <stdlib.h>
#include <glib.h>
#endif
#include <stdlib.h>
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
// FIXME: Must be moved, or rather passed as function argument.
#ifdef _WIN32
// FIXME: Must be moved, or rather passed as function argument.
#ifdef _WIN32
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
#ifdef _WIN32
#include <io.h>
#include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
#endif
#include "config.h"
#ifdef _WIN32
#include <io.h>
#include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
#endif
#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
/* TODO: Number of probes should be configurable. */
#define NUM_PROBES 8
/* TODO: Number of probes should be configurable. */
#define NUM_PROBES 8
#include <inttypes.h>
#include <glib.h>
#include <libudev.h>
#include <inttypes.h>
#include <glib.h>
#include <libudev.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "config.h"
#include "link-mso19.h"
#include "config.h"
#include "link-mso19.h"
#include <arpa/inet.h>
#endif
#include <glib.h>
#include <arpa/inet.h>
#endif
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "ols.h"
#ifdef _WIN32
#include "ols.h"
#ifdef _WIN32
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "saleae-logic.h"
static struct fx2_profile supported_fx2[] = {
#include "saleae-logic.h"
static struct fx2_profile supported_fx2[] = {
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SALEAE_LOGIC_H_
#define SALEAE_LOGIC_H_
#ifndef SALEAE_LOGIC_H_
#define SALEAE_LOGIC_H_
* on the session bus along with samples.
*/
void *session_data;
* on the session bus along with samples.
*/
void *session_data;
#endif /* SALEAE_LOGIC_H_ */
#endif /* SALEAE_LOGIC_H_ */
#include <libusb.h>
#include <stdio.h>
#include <libusb.h>
#include <stdio.h>
-#include <sigrok-internal.h>
+#include "sigrok-internal.h"
#include "gl_usb.h"
#define CTRL_IN (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
#include "gl_usb.h"
#define CTRL_IN (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "analyzer.h"
#define USB_VENDOR 0x0c12
#include "analyzer.h"
#define USB_VENDOR 0x0c12
#include <dirent.h>
#include <string.h>
#include <glib.h>
#include <dirent.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
/* The list of loaded plugins lives here. */
static GSList *plugins;
/* The list of loaded plugins lives here. */
static GSList *plugins;
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
static int sr_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
static int sr_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
#include <unistd.h>
#include <string.h>
#include <glib.h>
#include <unistd.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
/* demo.c */
extern GIOChannel channels[2];
/* demo.c */
extern GIOChannel channels[2];
#include <unistd.h>
#include <sys/time.h>
#include <zip.h>
#include <unistd.h>
#include <sys/time.h>
#include <zip.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
/* size of payloads sent across the session bus */
#define CHUNKSIZE 4096
/* size of payloads sent across the session bus */
#define CHUNKSIZE 4096
#include <zip.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <zip.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
extern struct sr_session *session;
extern struct sr_device_plugin session_driver;
extern struct sr_session *session;
extern struct sr_device_plugin session_driver;
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
/**
* Convert a numeric samplerate value to its "natural" string representation.
/**
* Convert a numeric samplerate value to its "natural" string representation.