X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=6f1480237a81687baaaf639381ad1de0bfd5a57f;hb=d98c4e35ce3187a8d4618a6c26ce35de636d7b91;hp=07501266dabdcc3e853a2348e67e653a1081a806;hpb=d08490aabaa66b547c8299b757f62ff5319dbf0b;p=libsigrok.git

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 07501266..6f148023 100644
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -82,8 +82,8 @@ SR_PRIV void sr_hw_cleanup_all(void);
 
 /*--- session.c -------------------------------------------------------------*/
 
-SR_PRIV int sr_session_bus(struct sr_dev *dev,
-			   struct sr_datafeed_packet *packet);
+SR_PRIV int sr_session_send(struct sr_dev *dev,
+			    struct sr_datafeed_packet *packet);
 
 /* Generic device instances */
 SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
@@ -93,7 +93,7 @@ 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_receive_data_callback_t cb, void *cb_data);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
@@ -105,7 +105,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 -----------------------------------------------*/