X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=6073f4bd81a93eccecf73f146521a6e36687c730;hb=2eb84c983584490153fe2bcbf10cc7ceaf46d033;hp=551d41e6bfe230402666c63c315d1b3a9c3274c3;hpb=c01bdebc575cc3abdba30610afa374f0364b0b94;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 551d41e6..6073f4bd 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -17,8 +17,12 @@ * along with this program. If not, see . */ -#ifndef LIBSIGROK_SIGROK_INTERNAL_H -#define LIBSIGROK_SIGROK_INTERNAL_H +/** @file + * @internal + */ + +#ifndef LIBSIGROK_LIBSIGROK_INTERNAL_H +#define LIBSIGROK_LIBSIGROK_INTERNAL_H #include #include @@ -26,6 +30,9 @@ #ifdef HAVE_LIBUSB_1_0 #include #endif +#ifdef HAVE_LIBSERIALPORT +#include +#endif /** * @file @@ -43,6 +50,13 @@ #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a) #endif +/* Portability fixes for FreeBSD. */ +#ifdef __FreeBSD__ +#define LIBUSB_CLASS_APPLICATION 0xfe +#define libusb_handle_events_timeout_completed(ctx, tv, c) \ + libusb_handle_events_timeout(ctx, tv) +#endif + struct sr_context { #ifdef HAVE_LIBUSB_1_0 libusb_context *libusb_ctx; @@ -50,24 +64,41 @@ 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 -#define SERIAL_PARITY_NONE 0 -#define SERIAL_PARITY_EVEN 1 -#define SERIAL_PARITY_ODD 2 +#ifdef HAVE_LIBSERIALPORT +#define SERIAL_PARITY_NONE SP_PARITY_NONE +#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; + /** Port is non-blocking. */ + int nonblocking; + /** libserialport port handle */ + struct sp_port *data; +}; +#endif + +struct sr_usbtmc_dev_inst { + char *device; int fd; }; /* Private driver context. */ struct drv_context { + /** sigrok context */ struct sr_context *sr_ctx; GSList *instances; }; @@ -99,11 +130,16 @@ SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx); SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb); #endif +#ifdef HAVE_LIBSERIALPORT /* Serial-specific instances */ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, const char *serialcomm); SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial); +#endif +/* USBTMC-specific instances */ +SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device); +SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc); /*--- hwdriver.c ------------------------------------------------------------*/ @@ -116,6 +152,37 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout, /*--- session.c -------------------------------------------------------------*/ +struct sr_session { + /** List of struct sr_dev pointers. */ + GSList *devs; + /** List of struct datafeed_callback pointers. */ + GSList *datafeed_callbacks; + GTimeVal starttime; + gboolean running; + + unsigned int num_sources; + + /* + * Both "sources" and "pollfds" are of the same size and contain pairs + * of descriptor and callback function. We can not embed the GPollFD + * into the source struct since we want to be able to pass the array + * of all poll descriptors to g_poll(). + */ + struct source *sources; + GPollFD *pollfds; + int source_timeout; + + /* + * These are our synchronization primitives for stopping the session in + * 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; +}; + SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, const struct sr_datafeed_packet *packet); SR_PRIV int sr_session_stop_sync(void); @@ -128,16 +195,28 @@ 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); -SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi, +#ifdef HAVE_LIBSERIALPORT +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 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 ----------------------------------------------*/ +#ifdef HAVE_LIBSERIALPORT enum { SERIAL_RDWR = 1, SERIAL_RDONLY = 2, @@ -163,6 +242,12 @@ 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 -----------------------------------------------*/ @@ -181,6 +266,104 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn); SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb); #endif +/*--- hardware/common/scpi.c ------------------------------------------------*/ + +#define SCPI_CMD_IDN "*IDN?" +#define SCPI_CMD_OPC "*OPC?" + +enum { + SCPI_CMD_SET_TRIGGER_SOURCE, + SCPI_CMD_SET_TIMEBASE, + SCPI_CMD_SET_VERTICAL_DIV, + SCPI_CMD_SET_TRIGGER_SLOPE, + SCPI_CMD_SET_COUPLING, + SCPI_CMD_SET_HORIZ_TRIGGERPOS, + SCPI_CMD_GET_ANALOG_CHAN_STATE, + SCPI_CMD_GET_DIG_CHAN_STATE, + SCPI_CMD_GET_TIMEBASE, + SCPI_CMD_GET_VERTICAL_DIV, + SCPI_CMD_GET_VERTICAL_OFFSET, + SCPI_CMD_GET_TRIGGER_SOURCE, + SCPI_CMD_GET_HORIZ_TRIGGERPOS, + SCPI_CMD_GET_TRIGGER_SLOPE, + SCPI_CMD_GET_COUPLING, + SCPI_CMD_SET_ANALOG_CHAN_STATE, + SCPI_CMD_SET_DIG_CHAN_STATE, + SCPI_CMD_GET_DIG_POD_STATE, + SCPI_CMD_SET_DIG_POD_STATE, + SCPI_CMD_GET_ANALOG_DATA, + SCPI_CMD_GET_DIG_DATA, +}; + +struct sr_scpi_hw_info { + char *manufacturer; + char *model; + char *serial_number; + char *firmware_version; +}; + +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 @@ -200,8 +383,12 @@ SR_PRIV int sr_es51922_parse(const uint8_t *buf, float *floatval, /*--- hardware/common/dmm/es519xx.c -----------------------------------------*/ -#define ES519XX_11B_PACKET_SIZE 2*11 -#define ES519XX_14B_PACKET_SIZE 14 +/** + * All 11-byte es519xx chips repeat each block twice for each conversion cycle + * so always read 2 blocks at a time. + */ +#define ES519XX_11B_PACKET_SIZE (11 * 2) +#define ES519XX_14B_PACKET_SIZE 14 struct es519xx_info { gboolean is_judge, is_voltage, is_auto, is_micro, is_current; @@ -217,31 +404,24 @@ struct es519xx_info { gboolean alt_functions, fivedigits, clampmeter, selectable_lpf; }; -SR_PRIV gboolean sr_es519xx_2400_11B_packet_valid(const uint8_t *buf); -SR_PRIV int sr_es519xx_2400_11B_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog *analog, - void *info); -SR_PRIV gboolean sr_es519xx_19200_11B_5digits_packet_valid(const uint8_t *buf); -SR_PRIV int sr_es519xx_19200_11B_5difits_parse(const uint8_t *buf, - float *floatval, struct sr_datafeed_analog *analog, void *info); -SR_PRIV gboolean sr_es519xx_19200_11B_clamp_packet_valid(const uint8_t *buf); -SR_PRIV int sr_es519xx_19200_11B_clamp_parse(const uint8_t *buf, - float *floatval, - struct sr_datafeed_analog *analog, - void *info); -SR_PRIV gboolean sr_es519xx_19200_11B_packet_valid(const uint8_t *buf); -SR_PRIV int sr_es519xx_19200_11B_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog *analog, - void *info); -SR_PRIV gboolean sr_es519xx_19200_14B_packet_valid(const uint8_t *buf); -SR_PRIV int sr_es519xx_19200_14B_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog *analog, - void *info); -SR_PRIV gboolean sr_es519xx_19200_14B_selectable_lpfpacket_valid(const uint8_t *buf); -SR_PRIV int sr_es519xx_19200_14B_selectable_lpf_parse(const uint8_t *buf, - float *floatval, - struct sr_datafeed_analog *analog, - void *info); +SR_PRIV gboolean sr_es519xx_2400_11b_packet_valid(const uint8_t *buf); +SR_PRIV int sr_es519xx_2400_11b_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); +SR_PRIV gboolean sr_es519xx_19200_11b_5digits_packet_valid(const uint8_t *buf); +SR_PRIV int sr_es519xx_19200_11b_5digits_parse(const uint8_t *buf, + float *floatval, struct sr_datafeed_analog *analog, void *info); +SR_PRIV gboolean sr_es519xx_19200_11b_clamp_packet_valid(const uint8_t *buf); +SR_PRIV int sr_es519xx_19200_11b_clamp_parse(const uint8_t *buf, + float *floatval, struct sr_datafeed_analog *analog, void *info); +SR_PRIV gboolean sr_es519xx_19200_11b_packet_valid(const uint8_t *buf); +SR_PRIV int sr_es519xx_19200_11b_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); +SR_PRIV gboolean sr_es519xx_19200_14b_packet_valid(const uint8_t *buf); +SR_PRIV int sr_es519xx_19200_14b_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); +SR_PRIV gboolean sr_es519xx_19200_14b_sel_lpf_packet_valid(const uint8_t *buf); +SR_PRIV int sr_es519xx_19200_14b_sel_lpf_parse(const uint8_t *buf, + float *floatval, struct sr_datafeed_analog *analog, void *info); /*--- hardware/common/dmm/fs9922.c ------------------------------------------*/ @@ -287,11 +467,14 @@ SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *i struct metex14_info { gboolean is_ac, is_dc, is_resistance, is_capacity, is_temperature; gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad; - gboolean is_hertz, is_ohm, is_celsius, is_nano, is_micro, is_milli; - gboolean is_kilo, is_mega, is_gain, is_decibel, is_hfe, is_unitless; + gboolean is_hertz, is_ohm, is_celsius, is_pico, is_nano, is_micro; + gboolean is_milli, is_kilo, is_mega, is_gain, is_decibel, is_hfe; + gboolean is_unitless; }; +#ifdef HAVE_LIBSERIALPORT SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial); +#endif SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf); SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info);