Revert "Add sr_session_append(): add captured data to an existing session file"

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 551d41e6bfe230402666c63c315d1b3a9c3274c3..026e608b136a41091e26ab05eb430954d5957a43 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -43,6 +43,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;
@@ -119,7 +126,6 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 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 -----------------------------------------------------------------*/
 
@@ -200,8 +206,12 @@ SR_PRIV int sr_es51922_parse(const uint8_t *buf, float *floatval,
 
 /*--- hardware/common/dmm/es519xx.c -----------------------------------------*/
 
-#define ES519XX_11B_PACKET_SIZE 2*11
-#define ES519XX_14B_PACKET_SIZE   14
+/**
+ * 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;
@@ -217,31 +227,24 @@ struct es519xx_info {
        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_5difits_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_selectable_lpfpacket_valid(const uint8_t *buf);
-SR_PRIV int sr_es519xx_19200_14B_selectable_lpf_parse(const uint8_t *buf,
-                                       float *floatval,
-                                       struct sr_datafeed_analog *analog,
-                                       void *info);
+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 ------------------------------------------*/
 
@@ -287,8 +290,9 @@ SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *i
 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;
 };
 
 SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial);