X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=50f83bd1b54e267b752bdc18a53c3835d4de7a19;hb=00f0016cc361008cd9eb2e52fd2a01f333c0e3cd;hp=ad578e98244ae3b3f47452377daf02279c6b3c14;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index ad578e98..50f83bd1 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -17,9 +17,11 @@ * along with this program. If not, see . */ -/** @file - * @internal - */ +/** + * @file + * + * @internal + */ #ifndef LIBSIGROK_LIBSIGROK_INTERNAL_H #define LIBSIGROK_LIBSIGROK_INTERNAL_H @@ -332,6 +334,8 @@ struct zip_stat; #define SR_REGISTER_DEV_DRIVER(name) \ SR_REGISTER_DEV_DRIVER_LIST(name##_list, &name); +SR_API void sr_drivers_init(struct sr_context *context); + struct sr_context { struct sr_dev_driver **driver_list; #ifdef HAVE_LIBUSB_1_0 @@ -422,16 +426,25 @@ struct sr_input_module { * Check if this input module can load and parse the specified stream. * * @param[in] metadata Metadata the module can use to identify the stream. + * @param[out] confidence "Strength" of the detection. + * Specialized handlers can take precedence over generic/basic support. * * @retval SR_OK This module knows the format. * @retval SR_ERR_NA There wasn't enough data for this module to * positively identify the format. - * @retval SR_ERR_DATA This module knows the format, but cannot handle it. - * This means the stream is either corrupt, or indicates a feature - * that the module does not support. + * @retval SR_ERR_DATA This module knows the format, but cannot handle + * it. This means the stream is either corrupt, or indicates a + * feature that the module does not support. * @retval SR_ERR This module does not know the format. + * + * Lower numeric values of 'confidence' mean that the input module + * stronger believes in its capability to handle this specific format. + * This way, multiple input modules can claim support for a format, + * and the application can pick the best match, or try fallbacks + * in case of errors. This approach also copes with formats that + * are unreliable to detect in the absence of magic signatures. */ - int (*format_match) (GHashTable *metadata); + int (*format_match) (GHashTable *metadata, unsigned int *confidence); /** * Initialize the input module. @@ -466,16 +479,16 @@ struct sr_input_module { */ int (*end) (struct sr_input *in); - /** - * Reset the input module's input handling structures. - * - * Causes the input module to reset its internal state so that we can - * re-send the input data from the beginning without having to - * re-create the entire input module. - * - * @retval SR_OK Success. - * @retval other Negative error code. - */ + /** + * Reset the input module's input handling structures. + * + * Causes the input module to reset its internal state so that we can + * re-send the input data from the beginning without having to + * re-create the entire input module. + * + * @retval SR_OK Success. + * @retval other Negative error code. + */ int (*reset) (struct sr_input *in); /** @@ -493,7 +506,7 @@ struct sr_input_module { /** Output module instance. */ struct sr_output { - /** A pointer to this output's module. */ + /** A pointer to this output's module. */ const struct sr_output_module *module; /** @@ -610,7 +623,7 @@ struct sr_output_module { /** Transform module instance. */ struct sr_transform { - /** A pointer to this transform's module. */ + /** A pointer to this transform's module. */ const struct sr_transform_module *module; /** @@ -732,7 +745,7 @@ struct drv_context { /*--- log.c -----------------------------------------------------------------*/ -#if defined(G_OS_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +#if defined(_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) /* * On MinGW, we need to specify the gnu_printf format flavor or GCC * will assume non-standard Microsoft printf syntax. @@ -830,6 +843,8 @@ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *data); SR_PRIV void sr_hw_cleanup_all(const struct sr_context *ctx); SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data); SR_PRIV void sr_config_free(struct sr_config *src); +SR_PRIV int sr_dev_acquisition_start(struct sr_dev_inst *sdi); +SR_PRIV int sr_dev_acquisition_stop(struct sr_dev_inst *sdi); /*--- session.c -------------------------------------------------------------*/ @@ -924,22 +939,65 @@ typedef void (*std_dev_clear_callback)(void *priv); SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx); SR_PRIV int std_cleanup(const struct sr_dev_driver *di); +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 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, - dev_close_callback dev_close_fn, - struct sr_serial_dev_inst *serial, const char *prefix); +SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi); #endif -SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi, - const char *prefix); -SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi, - const char *prefix); -SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver, +SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi); +SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi); +SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi); +SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi); +SR_PRIV int std_dev_clear_with_callback(const struct sr_dev_driver *driver, std_dev_clear_callback clear_private); +SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver); SR_PRIV GSList *std_dev_list(const struct sr_dev_driver *di); SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi); SR_PRIV GSList *std_scan_complete(struct sr_dev_driver *di, GSList *devices); +SR_PRIV int std_opts_config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg, + const uint32_t scanopts[], size_t scansize, const uint32_t drvopts[], + size_t drvsize, const uint32_t devopts[], size_t devsize); + +#define STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts) \ + std_opts_config_list(key, data, sdi, cg, ARRAY_AND_SIZE(scanopts), \ + ARRAY_AND_SIZE(drvopts), ARRAY_AND_SIZE(devopts)) + +SR_PRIV GVariant *std_gvar_tuple_array(const uint64_t a[][2], unsigned int n); +SR_PRIV GVariant *std_gvar_tuple_rational(const struct sr_rational *r, unsigned int n); +SR_PRIV GVariant *std_gvar_samplerates(const uint64_t samplerates[], unsigned int n); +SR_PRIV GVariant *std_gvar_samplerates_steps(const uint64_t samplerates[], unsigned int n); +SR_PRIV GVariant *std_gvar_min_max_step(double min, double max, double step); +SR_PRIV GVariant *std_gvar_min_max_step_array(const double a[3]); +SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double dmin, const double dmax, const double dstep); + +SR_PRIV GVariant *std_gvar_tuple_u64(uint64_t low, uint64_t high); +SR_PRIV GVariant *std_gvar_tuple_double(double low, double high); + +SR_PRIV GVariant *std_gvar_array_i32(const int32_t a[], unsigned int n); +SR_PRIV GVariant *std_gvar_array_u32(const uint32_t a[], unsigned int n); +SR_PRIV GVariant *std_gvar_array_u64(const uint64_t a[], unsigned int n); +SR_PRIV GVariant *std_gvar_array_str(const char *a[], unsigned int n); + +SR_PRIV GVariant *std_gvar_thresholds(const double a[][2], unsigned int n); + +SR_PRIV int std_str_idx(GVariant *data, const char *a[], unsigned int n); +SR_PRIV int std_u64_idx(GVariant *data, const uint64_t a[], unsigned int n); +SR_PRIV int std_u8_idx(GVariant *data, const uint8_t a[], unsigned int n); + +SR_PRIV int std_str_idx_s(const char *s, const char *a[], unsigned int n); +SR_PRIV int std_u8_idx_s(uint8_t b, const uint8_t a[], unsigned int n); + +SR_PRIV int std_u64_tuple_idx(GVariant *data, const uint64_t a[][2], unsigned int n); +SR_PRIV int std_double_tuple_idx(GVariant *data, const double a[][2], unsigned int n); +SR_PRIV int std_double_tuple_idx_d0(const double d, const double a[][2], unsigned int n); + +SR_PRIV int std_cg_idx(const struct sr_channel_group *cg, struct sr_channel_group *a[], unsigned int n); + /*--- resource.c ------------------------------------------------------------*/ SR_PRIV int64_t sr_file_get_size(FILE *file); @@ -962,6 +1020,7 @@ 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); +SR_PRIV int sr_atod_ascii(const char *str, double *ret); SR_PRIV int sr_atof_ascii(const char *str, float *ret); /*--- soft-trigger.c --------------------------------------------------------*/ @@ -1050,6 +1109,8 @@ SR_PRIV int usb_source_add(struct sr_session *session, struct sr_context *ctx, int timeout, sr_receive_data_callback cb, void *cb_data); SR_PRIV int usb_source_remove(struct sr_session *session, struct sr_context *ctx); SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len); +SR_PRIV gboolean usb_match_manuf_prod(libusb_device *dev, + const char *manufacturer, const char *product); #endif @@ -1127,29 +1188,30 @@ struct es519xx_info { uint32_t baudrate; int packet_size; gboolean alt_functions, fivedigits, clampmeter, selectable_lpf; + int digits; }; 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); SR_PRIV gboolean sr_es519xx_2400_11b_altfn_packet_valid(const uint8_t *buf); SR_PRIV int sr_es519xx_2400_11b_altfn_parse(const uint8_t *buf, - float *floatval, struct sr_datafeed_analog_old *analog, void *info); + 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_old *analog, void *info); + 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_old *analog, void *info); + 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_old *analog, void *info); + 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_old *analog, void *info); + 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_old *analog, void *info); + float *floatval, struct sr_datafeed_analog *analog, void *info); /*--- hardware/dmm/fs9922.c -------------------------------------------------*/ @@ -1166,8 +1228,8 @@ 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_old *analog, void *info); -SR_PRIV void sr_fs9922_z1_diode(struct sr_datafeed_analog_old *analog, void *info); + 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 -------------------------------------------------*/ @@ -1182,12 +1244,27 @@ 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_old *analog, void *info); -SR_PRIV void sr_fs9721_00_temp_c(struct sr_datafeed_analog_old *analog, void *info); -SR_PRIV void sr_fs9721_01_temp_c(struct sr_datafeed_analog_old *analog, void *info); -SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog_old *analog, void *info); -SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog_old *analog, void *info); -SR_PRIV void sr_fs9721_max_c_min(struct sr_datafeed_analog_old *analog, void *info); + 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); +SR_PRIV void sr_fs9721_max_c_min(struct sr_datafeed_analog *analog, void *info); + +/*--- hardware/dmm/ms8250d.c ------------------------------------------------*/ + +#define MS8250D_PACKET_SIZE 18 + +struct ms8250d_info { + gboolean is_ac, is_dc, is_auto, is_rs232, is_micro, is_nano, is_kilo; + gboolean is_diode, is_milli, is_percent, is_mega, is_beep, is_farad; + gboolean is_ohm, is_rel, is_hold, is_ampere, is_volt, is_hz, is_bat; + gboolean is_ncv, is_min, is_max, is_sign, is_autotimer; +}; + +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 ------------------------------------------------*/ @@ -1203,26 +1280,31 @@ struct dtm0660_info { 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); /*--- hardware/dmm/m2110.c --------------------------------------------------*/ #define BBCGM_M2110_PACKET_SIZE 9 +/* Dummy info struct. The parser does not use it. */ +struct m2110_info { int dummy; }; + 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); /*--- hardware/dmm/metex14.c ------------------------------------------------*/ #define METEX14_PACKET_SIZE 14 struct metex14_info { + size_t ch_idx; 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_pico, is_nano, is_micro; - gboolean is_milli, is_kilo, is_mega, is_gain, is_decibel, is_hfe; - gboolean is_unitless, is_logic; + gboolean is_hertz, is_ohm, is_celsius, is_fahrenheit, is_watt; + gboolean is_pico, is_nano, is_micro, is_milli, is_kilo, is_mega; + gboolean is_gain, is_decibel, is_power, is_decibel_mw, is_power_factor; + gboolean is_hfe, is_unitless, is_logic, is_min, is_max, is_avg; }; #ifdef HAVE_LIBSERIALPORT @@ -1230,7 +1312,10 @@ 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); +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 -------------------------------------------------*/ @@ -1241,7 +1326,7 @@ struct rs9lcd_info { int dummy; }; 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); /*--- hardware/dmm/bm25x.c --------------------------------------------------*/ @@ -1252,7 +1337,7 @@ struct bm25x_info { int dummy; }; 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); /*--- hardware/dmm/ut71x.c --------------------------------------------------*/ @@ -1267,7 +1352,7 @@ struct ut71x_info { 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); /*--- hardware/dmm/vc870.c --------------------------------------------------*/ @@ -1288,7 +1373,22 @@ struct vc870_info { 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); + +/*--- hardware/dmm/vc96.c ---------------------------------------------------*/ + +#define VC96_PACKET_SIZE 13 + +struct vc96_info { + size_t ch_idx; + gboolean is_ac, is_dc, is_resistance, is_diode, is_ampere, is_volt; + gboolean is_ohm, is_micro, is_milli, is_kilo, is_mega, is_hfe; + gboolean is_unitless; +}; + +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 ------------------------------------------------*/ @@ -1318,7 +1418,32 @@ struct ut372_info { 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_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); + +/*--- hardware/dmm/asycii.c -------------------------------------------------*/ + +#define ASYCII_PACKET_SIZE 16 + +struct asycii_info { + gboolean is_ac, is_dc, is_ac_and_dc; + gboolean is_resistance, is_capacitance, is_diode, is_gain; + gboolean is_frequency, is_duty_cycle, is_duty_pos, is_duty_neg; + gboolean is_pulse_width, is_period_pos, is_period_neg; + gboolean is_pulse_count, is_count_pos, is_count_neg; + gboolean is_ampere, is_volt, is_volt_ampere, is_farad, is_ohm; + gboolean is_hertz, is_percent, is_seconds, is_decibel; + gboolean is_pico, is_nano, is_micro, is_milli, is_kilo, is_mega; + gboolean is_unitless; + gboolean is_peak_min, is_peak_max; + gboolean is_invalid; +}; + +#ifdef HAVE_LIBSERIALPORT +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); /*--- hardware/scale/kern.c -------------------------------------------------*/ @@ -1331,7 +1456,7 @@ struct kern_info { SR_PRIV gboolean sr_kern_packet_valid(const uint8_t *buf); SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog_old *analog, void *info); + struct sr_datafeed_analog *analog, void *info); /*--- sw_limits.c -----------------------------------------------------------*/