sr: fx2lafw: Forgot to add (C) line to fx2lafw.h in recent commit.

[libsigrok.git] / sigrok-internal.h

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 62b7bac9bceae4aed10b1368f42e34f6b749c6e8..fde076bb931ab4bbf09ff62f9649ac3409ad054f 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -53,8 +53,6 @@ struct sr_serial_dev_inst {
        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 +89,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 *user_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 ----------------------------------------------*/
 
@@ -105,7 +103,7 @@ SR_PRIV int serial_write(int fd, const void *buf, size_t count);
 SR_PRIV int serial_read(int fd, void *buf, size_t count);
 SR_PRIV void *serial_backup_params(int fd);
 SR_PRIV void serial_restore_params(int fd, void *backup);
-SR_PRIV int serial_set_params(int fd, int speed, int bits, int parity,
+SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
                              int stopbits, int flowcontrol);
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/