X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=376e657e05c59e7d7c6617bb6dffed810bfa5015;hb=ae67644fe5340d9c6e450fb0443178af356e0647;hp=6e1cac2d969ee9739d0b1e76b6dc62be20c6942e;hpb=7381251e33611b6c06f3adedfcf2e1943453670e;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 6e1cac2d..376e657e 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -26,6 +26,9 @@ #ifdef HAVE_LIBUSB_1_0 #include #endif +#ifdef HAVE_LIBSERIALPORT +#include +#endif /** * @file @@ -43,6 +46,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; @@ -57,13 +67,21 @@ struct sr_usb_dev_inst { }; #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 { char *port; char *serialcomm; int fd; + struct sp_port *data; +}; +#endif + +struct sr_usbtmc_dev_inst { + char *device; + int fd; }; /* Private driver context. */ @@ -99,11 +117,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,20 +139,52 @@ 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. + */ + GMutex stop_mutex; + 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); +SR_PRIV int sr_sessionfile_check(const char *filename); /*--- std.c -----------------------------------------------------------------*/ typedef int (*dev_close_t)(struct sr_dev_inst *sdi); typedef void (*std_dev_clear_t)(void *priv); -SR_PRIV int std_hw_init(struct sr_context *sr_ctx, struct sr_dev_driver *di, +SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di, const char *prefix); -SR_PRIV int std_hw_dev_acquisition_stop_serial(struct sr_dev_inst *sdi, - void *cb_data, dev_close_t hw_dev_close_fn, +#ifdef HAVE_LIBSERIALPORT +SR_PRIV int std_dev_acquisition_stop_serial(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, @@ -137,6 +192,7 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver, /*--- hardware/common/serial.c ----------------------------------------------*/ +#ifdef HAVE_LIBSERIALPORT enum { SERIAL_RDWR = 1, SERIAL_RDONLY = 2, @@ -162,6 +218,7 @@ 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); +#endif /*--- hardware/common/ezusb.c -----------------------------------------------*/ @@ -197,6 +254,48 @@ SR_PRIV gboolean sr_es51922_packet_valid(const uint8_t *buf); SR_PRIV int sr_es51922_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); +/*--- hardware/common/dmm/es519xx.c -----------------------------------------*/ + +/** + * 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; + gboolean is_milli, is_resistance, is_continuity, is_diode; + gboolean is_frequency, is_rpm, is_capacitance, is_duty_cycle; + gboolean is_temperature, is_celsius, is_fahrenheit; + gboolean is_adp0, is_adp1, is_adp2, is_adp3; + gboolean is_sign, is_batt, is_ol, is_pmax, is_pmin, is_apo; + gboolean is_dc, is_ac, is_vahz, is_min, is_max, is_rel, is_hold; + gboolean is_digit4, is_ul, is_vasel, is_vbar, is_lpf1, is_lpf0, is_rmr; + uint32_t baudrate; + int packet_size; + 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_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 ------------------------------------------*/ #define FS9922_PACKET_SIZE 14 @@ -213,6 +312,7 @@ struct fs9922_info { SR_PRIV gboolean sr_fs9922_packet_valid(const uint8_t *buf); SR_PRIV int sr_fs9922_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); +SR_PRIV void sr_fs9922_z1_diode(struct sr_datafeed_analog *analog, void *info); /*--- hardware/common/dmm/fs9721.c ------------------------------------------*/ @@ -228,6 +328,10 @@ struct fs9721_info { SR_PRIV gboolean sr_fs9721_packet_valid(const uint8_t *buf); SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); +SR_PRIV void sr_fs9721_00_temp_c(struct sr_datafeed_analog *analog, void *info); +SR_PRIV void sr_fs9721_01_temp_c(struct sr_datafeed_analog *analog, void *info); +SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog *analog, void *info); +SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *info); /*--- hardware/common/dmm/metex14.c -----------------------------------------*/ @@ -236,11 +340,14 @@ SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval, 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);