libsigrok: Rename open/close to opendev/closedev.

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 1ad12e96dea80b0f0896b557f16c7c93bf9085a8..2fd171198e63e6d822d39b7d87a6692bb7164910 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -115,7 +115,7 @@ struct sr_datafeed_header {
        int num_logic_probes;
 };
 
-#if 0
+#if defined(HAVE_LA_ALSA)
 struct sr_analog_probe {
        uint8_t att;
        uint8_t res;    /* Needs to be a power of 2, FIXME */
@@ -135,7 +135,7 @@ struct sr_input {
 };
 
 struct sr_input_format {
-       char *extension;
+       char *id;
        char *description;
        int (*format_match) (const char *filename);
        int (*init) (struct sr_input *in);
@@ -150,7 +150,7 @@ struct sr_output {
 };
 
 struct sr_output_format {
-       char *extension;
+       char *id;
        char *description;
        int df_type;
        int (*init) (struct sr_output *o);
@@ -327,8 +327,8 @@ struct sr_device_plugin {
        void (*cleanup) (void);
 
        /* Device-specific */
-       int (*open) (int device_index);
-       void (*close) (int device_index);
+       int (*opendev) (int device_index);
+       void (*closedev) (int device_index);
        void *(*get_device_info) (int device_index, int device_info_id);
        int (*get_status) (int device_index);
        int *(*get_capabilities) (void);