serial-dmm: Use a custom dummy struct for m2110.

[libsigrok.git] / src / libsigrok-internal.h

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 96597e6de88a5d1e01124db7a4267760bb9e1a14..2e041a26aef37edac32f4823ae3e864685085bc4 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -17,9 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file
-  * @internal
-  */
+/**
+ * @file
+ *
+ * @internal
+ */
 
 #ifndef LIBSIGROK_LIBSIGROK_INTERNAL_H
 #define LIBSIGROK_LIBSIGROK_INTERNAL_H
@@ -332,7 +334,7 @@ struct zip_stat;
 #define SR_REGISTER_DEV_DRIVER(name) \
        SR_REGISTER_DEV_DRIVER_LIST(name##_list, &name);
 
-SR_PRIV void sr_drivers_init(struct sr_context *context);
+SR_API void sr_drivers_init(struct sr_context *context);
 
 struct sr_context {
        struct sr_dev_driver **driver_list;
@@ -428,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);
@@ -468,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);
 
        /**
@@ -495,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;
 
        /**
@@ -612,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;
 
        /**
@@ -1125,6 +1127,7 @@ 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);
@@ -1207,6 +1210,9 @@ SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval,
 
 #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 *analog, void *info);
@@ -1318,6 +1324,31 @@ 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 -------------------------------------------------*/
+
+#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 -------------------------------------------------*/
 
 struct kern_info {