X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=e1623f629b0e2c675cf59386eea95d542e8bf5bb;hb=ad5aa993ae5f5277755ed9c6e99fd647f4fa0d7b;hp=fc3c8d085b01cb794af3444372d80dc70f0102da;hpb=fdcdfe53d8fa27e101f7d4b206f05a4f3513c306;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index fc3c8d08..e1623f62 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -26,6 +26,8 @@ #ifndef LIBSIGROK_LIBSIGROK_INTERNAL_H #define LIBSIGROK_LIBSIGROK_INTERNAL_H +#include "config.h" + #include #ifdef HAVE_LIBSERIALPORT #include @@ -34,7 +36,9 @@ #include #endif #include +#include #include +#include struct zip; struct zip_stat; @@ -720,14 +724,26 @@ struct sr_usb_dev_inst { }; #endif -#ifdef HAVE_LIBSERIALPORT +struct sr_serial_dev_inst; +#ifdef HAVE_SERIAL_COMM +struct ser_lib_functions; struct sr_serial_dev_inst { /** Port name, e.g. '/dev/tty42'. */ char *port; /** Comm params for serial_set_paramstr(). */ char *serialcomm; + struct ser_lib_functions *lib_funcs; + struct { + int bit_rate; + int data_bits; + int parity_bits; + int stop_bits; + } comm_params; + GString *rcv_buffer; +#ifdef HAVE_LIBSERIALPORT /** libserialport port handle */ - struct sp_port *data; + struct sp_port *sp_data; +#endif }; #endif @@ -829,7 +845,31 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus, SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb); #endif -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM +#ifndef HAVE_LIBSERIALPORT +/* + * Some identifiers which initially got provided by libserialport are + * used internally within the libsigrok serial layer's implementation, + * while libserialport no longer is the exclusive provider of serial + * communication support. Declare the identifiers here so they remain + * available across all build configurations. + */ +enum libsp_parity { + SP_PARITY_NONE = 0, + SP_PARITY_ODD = 1, + SP_PARITY_EVEN = 2, + SP_PARITY_MARK = 3, + SP_PARITY_SPACE = 4, +}; + +enum libsp_flowcontrol { + SP_FLOWCONTROL_NONE = 0, + SP_FLOWCONTROL_XONXOFF = 1, + SP_FLOWCONTROL_RTSCTS = 2, + SP_FLOWCONTROL_DTRDSR = 3, +}; +#endif + /* Serial-specific instances */ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, const char *serialcomm); @@ -946,7 +986,7 @@ SR_PRIV int std_dummy_dev_open(struct sr_dev_inst *sdi); SR_PRIV int std_dummy_dev_close(struct sr_dev_inst *sdi); SR_PRIV int std_dummy_dev_acquisition_start(const struct sr_dev_inst *sdi); SR_PRIV int std_dummy_dev_acquisition_stop(struct sr_dev_inst *sdi); -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM 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); #endif @@ -1054,9 +1094,9 @@ SR_PRIV void soft_trigger_logic_free(struct soft_trigger_logic *st); SR_PRIV int soft_trigger_logic_check(struct soft_trigger_logic *st, uint8_t *buf, int len, int *pre_trigger_samples); -/*--- hardware/serial.c -----------------------------------------------------*/ +/*--- serial.c --------------------------------------------------------------*/ -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM enum { SERIAL_RDWR = 1, SERIAL_RDONLY = 2, @@ -1064,10 +1104,15 @@ enum { typedef gboolean (*packet_valid_callback)(const uint8_t *buf); +typedef GSList *(*sr_ser_list_append_t)(GSList *devs, const char *name, + const char *desc); +typedef GSList *(*sr_ser_find_append_t)(GSList *devs, const char *name); + SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags); SR_PRIV int serial_close(struct sr_serial_dev_inst *serial); SR_PRIV int serial_flush(struct sr_serial_dev_inst *serial); SR_PRIV int serial_drain(struct sr_serial_dev_inst *serial); +SR_PRIV size_t serial_has_receive_data(struct sr_serial_dev_inst *serial); SR_PRIV int serial_write_blocking(struct sr_serial_dev_inst *serial, const void *buf, size_t count, unsigned int timeout_ms); SR_PRIV int serial_write_nonblocking(struct sr_serial_dev_inst *serial, @@ -1096,9 +1141,45 @@ SR_PRIV int serial_source_remove(struct sr_session *session, struct sr_serial_dev_inst *serial); SR_PRIV GSList *sr_serial_find_usb(uint16_t vendor_id, uint16_t product_id); SR_PRIV int serial_timeout(struct sr_serial_dev_inst *port, int num_bytes); + +SR_PRIV void sr_ser_discard_queued_data(struct sr_serial_dev_inst *serial); +SR_PRIV size_t sr_ser_has_queued_data(struct sr_serial_dev_inst *serial); +SR_PRIV void sr_ser_queue_rx_data(struct sr_serial_dev_inst *serial, + const uint8_t *data, size_t len); +SR_PRIV size_t sr_ser_unqueue_rx_data(struct sr_serial_dev_inst *serial, + uint8_t *data, size_t len); + +struct ser_lib_functions { + int (*open)(struct sr_serial_dev_inst *serial, int flags); + int (*close)(struct sr_serial_dev_inst *serial); + int (*flush)(struct sr_serial_dev_inst *serial); + int (*drain)(struct sr_serial_dev_inst *serial); + int (*write)(struct sr_serial_dev_inst *serial, + const void *buf, size_t count, + int nonblocking, unsigned int timeout_ms); + int (*read)(struct sr_serial_dev_inst *serial, + void *buf, size_t count, + int nonblocking, unsigned int timeout_ms); + int (*set_params)(struct sr_serial_dev_inst *serial, + int baudrate, int bits, int parity, int stopbits, + int flowcontrol, int rts, int dtr); + int (*setup_source_add)(struct sr_session *session, + struct sr_serial_dev_inst *serial, + int events, int timeout, + sr_receive_data_callback cb, void *cb_data); + int (*setup_source_remove)(struct sr_session *session, + struct sr_serial_dev_inst *serial); + GSList *(*list)(GSList *list, sr_ser_list_append_t append); + GSList *(*find_usb)(GSList *list, sr_ser_find_append_t append, + uint16_t vendor_id, uint16_t product_id); + int (*get_frame_format)(struct sr_serial_dev_inst *serial, + int *baud, int *bits); + size_t (*get_rx_avail)(struct sr_serial_dev_inst *serial); +}; +extern SR_PRIV struct ser_lib_functions *ser_lib_funcs_libsp; #endif -/*--- hardware/ezusb.c ------------------------------------------------------*/ +/*--- ezusb.c ---------------------------------------------------------------*/ #ifdef HAVE_LIBUSB_1_0 SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear); @@ -1108,7 +1189,7 @@ SR_PRIV int ezusb_upload_firmware(struct sr_context *ctx, libusb_device *dev, int configuration, const char *name); #endif -/*--- hardware/usb.c --------------------------------------------------------*/ +/*--- usb.c -----------------------------------------------------------------*/ #ifdef HAVE_LIBUSB_1_0 SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn); @@ -1176,7 +1257,7 @@ SR_PRIV int sr_modbus_write_multiple_registers(struct sr_modbus_dev_inst*modbus, SR_PRIV int sr_modbus_close(struct sr_modbus_dev_inst *modbus); SR_PRIV void sr_modbus_free(struct sr_modbus_dev_inst *modbus); -/*--- hardware/dmm/es519xx.c ------------------------------------------------*/ +/*--- dmm/es519xx.c ---------------------------------------------------------*/ /** * All 11-byte es519xx chips repeat each block twice for each conversion cycle @@ -1222,7 +1303,7 @@ 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/dmm/fs9922.c -------------------------------------------------*/ +/*--- dmm/fs9922.c ----------------------------------------------------------*/ #define FS9922_PACKET_SIZE 14 @@ -1240,7 +1321,7 @@ 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/dmm/fs9721.c -------------------------------------------------*/ +/*--- dmm/fs9721.c ----------------------------------------------------------*/ #define FS9721_PACKET_SIZE 14 @@ -1260,7 +1341,31 @@ 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); SR_PRIV void sr_fs9721_max_c_min(struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/ms8250d.c ------------------------------------------------*/ +/*--- dmm/ms2115b.c ---------------------------------------------------------*/ + +#define MS2115B_PACKET_SIZE 9 + +enum ms2115b_display { + MS2115B_DISPLAY_MAIN, + MS2115B_DISPLAY_SUB, + MS2115B_DISPLAY_COUNT, +}; + +struct ms2115b_info { + /* Selected channel. */ + size_t ch_idx; + gboolean is_ac, is_dc, is_auto; + gboolean is_diode, is_beep, is_farad; + gboolean is_ohm, is_ampere, is_volt, is_hz; + gboolean is_duty_cycle, is_percent; +}; + +extern SR_PRIV const char *ms2115b_channel_formats[]; +SR_PRIV gboolean sr_ms2115b_packet_valid(const uint8_t *buf); +SR_PRIV int sr_ms2115b_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); + +/*--- dmm/ms8250d.c ---------------------------------------------------------*/ #define MS8250D_PACKET_SIZE 18 @@ -1275,7 +1380,7 @@ SR_PRIV gboolean sr_ms8250d_packet_valid(const uint8_t *buf); SR_PRIV int sr_ms8250d_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/dtm0660.c ------------------------------------------------*/ +/*--- dmm/dtm0660.c ---------------------------------------------------------*/ #define DTM0660_PACKET_SIZE 15 @@ -1291,7 +1396,7 @@ SR_PRIV gboolean sr_dtm0660_packet_valid(const uint8_t *buf); SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/m2110.c --------------------------------------------------*/ +/*--- dmm/m2110.c -----------------------------------------------------------*/ #define BBCGM_M2110_PACKET_SIZE 9 @@ -1302,7 +1407,7 @@ SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf); SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/metex14.c ------------------------------------------------*/ +/*--- dmm/metex14.c ---------------------------------------------------------*/ #define METEX14_PACKET_SIZE 14 @@ -1316,7 +1421,7 @@ struct metex14_info { gboolean is_hfe, is_unitless, is_logic, is_min, is_max, is_avg; }; -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM 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); @@ -1326,7 +1431,7 @@ SR_PRIV gboolean sr_metex14_4packets_valid(const uint8_t *buf); SR_PRIV int sr_metex14_4packets_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/rs9lcd.c -------------------------------------------------*/ +/*--- dmm/rs9lcd.c ----------------------------------------------------------*/ #define RS9LCD_PACKET_SIZE 9 @@ -1337,7 +1442,7 @@ SR_PRIV gboolean sr_rs9lcd_packet_valid(const uint8_t *buf); SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/bm25x.c --------------------------------------------------*/ +/*--- dmm/bm25x.c -----------------------------------------------------------*/ #define BRYMEN_BM25X_PACKET_SIZE 15 @@ -1348,7 +1453,7 @@ SR_PRIV gboolean sr_brymen_bm25x_packet_valid(const uint8_t *buf); SR_PRIV int sr_brymen_bm25x_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/ut71x.c --------------------------------------------------*/ +/*--- dmm/ut71x.c -----------------------------------------------------------*/ #define UT71X_PACKET_SIZE 11 @@ -1363,7 +1468,7 @@ SR_PRIV gboolean sr_ut71x_packet_valid(const uint8_t *buf); SR_PRIV int sr_ut71x_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/vc870.c --------------------------------------------------*/ +/*--- dmm/vc870.c -----------------------------------------------------------*/ #define VC870_PACKET_SIZE 23 @@ -1384,7 +1489,7 @@ SR_PRIV gboolean sr_vc870_packet_valid(const uint8_t *buf); SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/vc96.c ---------------------------------------------------*/ +/*--- dmm/vc96.c ------------------------------------------------------------*/ #define VC96_PACKET_SIZE 13 @@ -1399,7 +1504,7 @@ SR_PRIV gboolean sr_vc96_packet_valid(const uint8_t *buf); SR_PRIV int sr_vc96_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/lcr/es51919.c ------------------------------------------------*/ +/*--- lcr/es51919.c ---------------------------------------------------------*/ SR_PRIV void es51919_serial_clean(void *priv); SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options, @@ -1417,7 +1522,7 @@ SR_PRIV int es51919_serial_config_list(uint32_t key, GVariant **data, SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi); SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi); -/*--- hardware/dmm/ut372.c --------------------------------------------------*/ +/*--- dmm/ut372.c -----------------------------------------------------------*/ #define UT372_PACKET_SIZE 27 @@ -1429,7 +1534,7 @@ SR_PRIV gboolean sr_ut372_packet_valid(const uint8_t *buf); SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/dmm/asycii.c -------------------------------------------------*/ +/*--- dmm/asycii.c ----------------------------------------------------------*/ #define ASYCII_PACKET_SIZE 16 @@ -1447,14 +1552,14 @@ struct asycii_info { gboolean is_invalid; }; -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM SR_PRIV int sr_asycii_packet_request(struct sr_serial_dev_inst *serial); #endif SR_PRIV gboolean sr_asycii_packet_valid(const uint8_t *buf); SR_PRIV int sr_asycii_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- src/dmm/eev121gw.c ----------------------------------------------------*/ +/*--- dmm/eev121gw.c --------------------------------------------------------*/ #define EEV121GW_PACKET_SIZE 19 @@ -1497,7 +1602,7 @@ SR_PRIV int sr_eev121gw_parse(const uint8_t *buf, float *floatval, SR_PRIV int sr_eev121gw_3displays_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); -/*--- hardware/scale/kern.c -------------------------------------------------*/ +/*--- scale/kern.c ----------------------------------------------------------*/ struct kern_info { gboolean is_gram, is_carat, is_ounce, is_pound, is_troy_ounce;