X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=741cf34c1f8d98aeaaa0798e870b1dc9b8a1ac0f;hb=090f1e1e5478ea15baa3731fefbd4aff9be78c77;hp=94056317eb12a236a1b8efea7f547bdef7adb88b;hpb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 94056317..741cf34c 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -426,6 +426,8 @@ 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 @@ -434,8 +436,15 @@ struct sr_input_module { * 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. @@ -940,6 +949,8 @@ 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); 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); @@ -970,6 +981,7 @@ 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); @@ -984,6 +996,8 @@ SR_PRIV int std_u64_tuple_idx(GVariant *data, const uint64_t a[][2], unsigned in 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); @@ -1006,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 --------------------------------------------------------*/ @@ -1236,6 +1251,21 @@ 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 ------------------------------------------------*/ #define DTM0660_PACKET_SIZE 15 @@ -1268,11 +1298,13 @@ SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval, #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 @@ -1281,6 +1313,9 @@ SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial); 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); +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 -------------------------------------------------*/