serial-dmm: Avoid duplicate symbol error

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index d7d31a33f131d9a46fa0e572945e5bd7e1c4824f..d68ec1439bcc588cafcde55d0fc411e04750d39a 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -426,6 +426,12 @@ enum {
        /** The device can act as a sound level meter. */
        SR_HWCAP_SOUNDLEVELMETER,
 
+       /** The device can measure temperature. */
+       SR_HWCAP_THERMOMETER,
+
+       /** The device can measure humidity. */
+       SR_HWCAP_HYGROMETER,
+
        /*--- Device configuration ------------------------------------------*/
 
        /** The device supports setting/changing its samplerate. */
@@ -605,7 +611,7 @@ struct sr_dev_driver {
        char *name;
        char *longname;
        int api_version;
-       int (*init) (void);
+       int (*init) (struct sr_context *sr_ctx);
        int (*cleanup) (void);
        GSList *(*scan) (GSList *options);
        GSList *(*dev_list) (void);