X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=0856c48013ad95eae0ecc3f6e9b1894a0d26a8c0;hb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;hp=ad578e98244ae3b3f47452377daf02279c6b3c14;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index ad578e98..0856c480 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 @@ -426,9 +430,9 @@ struct sr_input_module { * @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. */ int (*format_match) (GHashTable *metadata); @@ -466,16 +470,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 +497,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 +614,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; /** @@ -926,14 +930,10 @@ 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); #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_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_dev_clear(const struct sr_dev_driver *driver, std_dev_clear_callback clear_private); SR_PRIV GSList *std_dev_list(const struct sr_dev_driver *di); @@ -1127,29 +1127,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 +1167,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 +1183,12 @@ 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/dtm0660.c ------------------------------------------------*/ @@ -1203,7 +1204,7 @@ 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 --------------------------------------------------*/ @@ -1211,7 +1212,7 @@ SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval, 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 ------------------------------------------------*/ @@ -1230,7 +1231,7 @@ 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); /*--- hardware/dmm/rs9lcd.c -------------------------------------------------*/ @@ -1241,7 +1242,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 +1253,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 +1268,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 +1289,7 @@ 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/lcr/es51919.c ------------------------------------------------*/ @@ -1318,7 +1319,7 @@ 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/scale/kern.c -------------------------------------------------*/ @@ -1331,7 +1332,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 -----------------------------------------------------------*/