sr: demodevice: Reset sample limit when setting time limit and vice versa

[libsigrok.git] / sigrok-internal.h

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 6f1480237a81687baaaf639381ad1de0bfd5a57f..94ca2bc90a94bd08be177075471795335b6ff344 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -48,13 +48,14 @@ struct sr_usb_dev_inst {
 };
 #endif
 
+#define SERIAL_PARITY_NONE 0
+#define SERIAL_PARITY_EVEN 1
+#define SERIAL_PARITY_ODD  2
 struct sr_serial_dev_inst {
        char *port;
        int fd;
 };
 
-#define GTV_TO_MSEC(gtv)       (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
-
 #ifdef HAVE_LIBUSB_1_0
 /* USB-specific instances */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
@@ -91,9 +92,9 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
 SR_PRIV struct sr_dev_inst *sr_dev_inst_get(GSList *dev_insts, int dev_index);
 SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi);
 
-SR_PRIV void sr_source_remove(int fd);
-SR_PRIV void sr_source_add(int fd, int events, int timeout,
-                          sr_receive_data_callback_t cb, void *cb_data);
+SR_PRIV int sr_source_remove(int fd);
+SR_PRIV int sr_source_add(int fd, int events, int timeout,
+                         sr_receive_data_callback_t cb, void *cb_data);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/