sr: initial support for Hantek 2xxx/5200 USB oscilloscopes

[libsigrok.git] / sigrok-internal.h

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 1a297f9988a2ceccd546943881fbecb58fee513a..fde076bb931ab4bbf09ff62f9649ac3409ad054f 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -74,15 +74,14 @@ SR_PRIV int sr_info(const char *format, ...);
 SR_PRIV int sr_warn(const char *format, ...);
 SR_PRIV int sr_err(const char *format, ...);
 
-/*--- hwplugin.c ------------------------------------------------------------*/
+/*--- hwdriver.c ------------------------------------------------------------*/
 
-SR_PRIV int sr_hw_load_all(void);
 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,
@@ -90,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 rcv_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 ----------------------------------------------*/
 
@@ -104,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 -----------------------------------------------*/