X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=e27955ba20a182e3e2cbfd0a5cc21bbd223f1ca3;hb=98582bf53f61043e6918be291648f8f6dfb5f6b4;hp=52962fd61cebc189964702db4919c987429d71a2;hpb=8acbb89a1dd38f15e53c5a46c226c074db5c4efa;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 52962fd6..e27955ba 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -17,6 +17,10 @@ * along with this program. If not, see . */ +/** @file + * @internal + */ + #ifndef LIBSIGROK_SIGROK_INTERNAL_H #define LIBSIGROK_SIGROK_INTERNAL_H @@ -60,9 +64,13 @@ struct sr_context { }; #ifdef HAVE_LIBUSB_1_0 +/** USB device instance */ struct sr_usb_dev_inst { + /** USB bus */ uint8_t bus; + /** Device address on USB bus */ uint8_t address; + /** libusb device handle */ struct libusb_device_handle *devhdl; }; #endif @@ -72,10 +80,13 @@ struct sr_usb_dev_inst { #define SERIAL_PARITY_EVEN SP_PARITY_EVEN #define SERIAL_PARITY_ODD SP_PARITY_ODD struct sr_serial_dev_inst { + /** Port name, e.g. '/dev/tty42'. */ char *port; + /** Comm params for serial_set_paramstr(). */ char *serialcomm; - int fd; + /** Port is non-blocking. */ int nonblocking; + /** libserialport port handle */ struct sp_port *data; }; #endif @@ -87,6 +98,7 @@ struct sr_usbtmc_dev_inst { /* Private driver context. */ struct drv_context { + /** sigrok context */ struct sr_context *sr_ctx; GSList *instances; }; @@ -165,7 +177,9 @@ struct sr_session { * an async fashion. We need to make sure the session is stopped from * within the session thread itself. */ + /** Mutex protecting access to abort_session. */ GMutex stop_mutex; + /** Abort current session. See sr_session_stop(). */ gboolean abort_session; }; @@ -182,7 +196,8 @@ typedef void (*std_dev_clear_t)(void *priv); SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di, const char *prefix); #ifdef HAVE_LIBSERIALPORT -SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi, +SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi); +SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data, dev_close_t dev_close_fn, struct sr_serial_dev_inst *serial, const char *prefix); #endif @@ -190,6 +205,14 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi, const char *prefix); SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver, std_dev_clear_t clear_private); +SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi); + +/*--- strutil.c -------------------------------------------------------------*/ + +SR_PRIV int sr_atol(const char *str, long *ret); +SR_PRIV int sr_atoi(const char *str, int *ret); +SR_PRIV int sr_atod(const char *str, double *ret); +SR_PRIV int sr_atof(const char *str, float *ret); /*--- hardware/common/serial.c ----------------------------------------------*/ @@ -219,6 +242,11 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial, uint8_t *buf, size_t *buflen, size_t packet_size, packet_valid_t is_valid, 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); +SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial); #endif /*--- hardware/common/ezusb.c -----------------------------------------------*/ @@ -240,8 +268,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?" @@ -276,27 +302,68 @@ struct sr_scpi_hw_info { char *firmware_version; }; -SR_PRIV int sr_scpi_send(struct sr_serial_dev_inst *serial, - const char *command); -SR_PRIV int sr_scpi_get_string(struct sr_serial_dev_inst *serial, - const char *command, char **scpi_response); -SR_PRIV int sr_scpi_get_bool(struct sr_serial_dev_inst *serial, - const char *command, gboolean *scpi_response); -SR_PRIV int sr_scpi_get_int(struct sr_serial_dev_inst *serial, - const char *command, int *scpi_response); -SR_PRIV int sr_scpi_get_float(struct sr_serial_dev_inst *serial, - const char *command, float *scpi_response); -SR_PRIV int sr_scpi_get_double(struct sr_serial_dev_inst *serial, - const char *command, double *scpi_response); -SR_PRIV int sr_scpi_get_opc(struct sr_serial_dev_inst *serial); -SR_PRIV int sr_scpi_get_floatv(struct sr_serial_dev_inst *serial, - const char *command, GArray **scpi_response); -SR_PRIV int sr_scpi_get_hw_id(struct sr_serial_dev_inst *serial, - struct sr_scpi_hw_info **scpi_reponse); +struct sr_scpi_dev_inst { + int (*open)(void *priv); + int (*source_add)(void *priv, int events, + int timeout, sr_receive_data_callback_t cb, void *cb_data); + 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; +}; + +SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi); +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 *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); + +SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi, + const char *command, char **scpi_response); +SR_PRIV int sr_scpi_get_bool(struct sr_scpi_dev_inst *scpi, + const char *command, gboolean *scpi_response); +SR_PRIV int sr_scpi_get_int(struct sr_scpi_dev_inst *scpi, + const char *command, int *scpi_response); +SR_PRIV int sr_scpi_get_float(struct sr_scpi_dev_inst *scpi, + const char *command, float *scpi_response); +SR_PRIV int sr_scpi_get_double(struct sr_scpi_dev_inst *scpi, + const char *command, double *scpi_response); +SR_PRIV int sr_scpi_get_opc(struct sr_scpi_dev_inst *scpi); +SR_PRIV int sr_scpi_get_floatv(struct sr_scpi_dev_inst *scpi, + const char *command, GArray **scpi_response); +SR_PRIV int sr_scpi_get_uint8v(struct sr_scpi_dev_inst *scpi, + const char *command, GArray **scpi_response); +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); +/*--- 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 -----------------------------------------*/ #define ES51922_PACKET_SIZE 14