sr_session_new(): Return SR_ERR_ARG upon invalid argument.

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

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 2a4384c4b13047bb816fb9248d9ba558bdf3a07f..63fcff919c93f8c2c8455f44d084533aae1a9bba 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -177,7 +177,7 @@ struct sr_output {
         * For example, the module might store a pointer to a chunk of output
         * there, and only flush it when it reaches a certain size.
         */
-       void *internal;
+       void *priv;
 };
 
 /** Output module driver. */
@@ -209,7 +209,7 @@ struct sr_output_module {
         * If cached is TRUE, no new GVariants are created for the def and
         * values fields; instead, the current values are returned.
         */
-       struct sr_option *(*options) (gboolean cached);
+       struct sr_option *(*options) (void);
 
        /**
         * This function is called once, at the beginning of an output stream.
@@ -740,4 +740,15 @@ 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 *analog, void *info);
 
+/*--- hardware/common/dmm/bm25x.c -----------------------------------------*/
+
+#define BRYMEN_BM25X_PACKET_SIZE 15
+
+/* Dummy info struct. The parser does not use it. */
+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 *analog, void *info);
+
 #endif