Route sr_source_add for all serial devices through a serial_source_add wrapper.

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 3df28fe2195b0727aa2ee8b9936e02b389076bab..e4eef91ec3b718bcef4a2041376b376011fbf844 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -228,6 +228,8 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
                                 uint64_t timeout_ms, int baudrate);
 SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_device,
                                      const char **serial_options);
+SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
+               int timeout, sr_receive_data_callback_t cb, void *cb_data);
 #endif
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/
@@ -249,8 +251,6 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
 
 /*--- hardware/common/scpi.c ------------------------------------------------*/
 
-#ifdef HAVE_LIBSERIALPORT
-
 #define SCPI_CMD_IDN "*IDN?"
 #define SCPI_CMD_OPC "*OPC?"
 
@@ -292,6 +292,7 @@ struct sr_scpi_dev_inst {
        int (*source_remove)(void *priv);
        int (*send)(void *priv, const char *command);
        int (*receive)(void *priv, char **scpi_response);
+       int (*read)(void *priv, char *buf, int maxlen);
        int (*close)(void *priv);
        void (*free)(void *priv);
        void *priv;
@@ -302,9 +303,12 @@ SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events,
                int timeout, sr_receive_data_callback_t cb, void *cb_data);
 SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
-                       const char *command);
+               const char *format, ...);
+SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
+               const char *format, va_list args);
 SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi,
                        char **scpi_response);
+SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);
 SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi);
 SR_PRIV void sr_scpi_free(struct sr_scpi_dev_inst *scpi);
 
@@ -327,12 +331,21 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
                        struct sr_scpi_hw_info **scpi_response);
 SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
 
-#endif
-
 /*--- hardware/common/scpi_serial.c -----------------------------------------*/
 
+#ifdef HAVE_LIBSERIALPORT
 SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
                        const char *serialcomm);
+#endif
+
+/*--- hardware/common/scpi_tcp.c --------------------------------------------*/
+
+SR_PRIV struct sr_scpi_dev_inst *scpi_tcp_dev_inst_new(const char *address,
+                       const char *port);
+
+/*--- hardware/common/scpi_usbtmc.c -----------------------------------------*/
+
+SR_PRIV struct sr_scpi_dev_inst *scpi_usbtmc_dev_inst_new(const char *device);
 
 /*--- hardware/common/dmm/es51922.c -----------------------------------------*/