X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=624a141c7e34fb39ad9662c5a9eae361d0ab825e;hb=baed0211a1ecada69c5ab53cf979e2e543a0ceaa;hp=8fb9006aaeedad61f8f33b6bda211a690321d54c;hpb=cbc1413f31f3946ce79da5540cfbeace8924c9d1;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 8fb9006a..624a141c 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -26,7 +26,6 @@ #include #include -#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #ifdef HAVE_LIBUSB_1_0 #include #endif @@ -564,9 +563,6 @@ struct sr_usb_dev_inst { #endif #ifdef HAVE_LIBSERIALPORT -#define SERIAL_PARITY_NONE SP_PARITY_NONE -#define SERIAL_PARITY_EVEN SP_PARITY_EVEN -#define SERIAL_PARITY_ODD SP_PARITY_ODD struct sr_serial_dev_inst { /** Port name, e.g. '/dev/tty42'. */ char *port; @@ -682,15 +678,6 @@ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *data); SR_PRIV void sr_hw_cleanup_all(const struct sr_context *ctx); SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data); SR_PRIV void sr_config_free(struct sr_config *src); -SR_PRIV int sr_source_remove(int fd); -SR_PRIV int sr_source_remove_pollfd(GPollFD *pollfd); -SR_PRIV int sr_source_remove_channel(GIOChannel *channel); -SR_PRIV int sr_source_add(int fd, int events, int timeout, - sr_receive_data_callback cb, void *cb_data); -SR_PRIV int sr_source_add_pollfd(GPollFD *pollfd, int timeout, - sr_receive_data_callback cb, void *cb_data); -SR_PRIV int sr_source_add_channel(GIOChannel *channel, int events, int timeout, - sr_receive_data_callback cb, void *cb_data); /*--- session.c -------------------------------------------------------------*/