Bump package version to 0.2.1, libtool version to 1:1:0.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 9df848d4fdfc1a5267db82f3bc5951e04eabda3d..435d46af6dee27ed001f73d45910b458c49e145e 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -115,16 +115,16 @@ static int receive_data(int fd, int revents, void *cb_data)
 }
 
 /* driver callbacks */
-static int hw_cleanup(void);
+static int cleanup(void);
 
-static int hw_init(struct sr_context *sr_ctx)
+static int init(struct sr_context *sr_ctx)
 {
        (void)sr_ctx;
 
        return SR_OK;
 }
 
-static int hw_cleanup(void)
+static int cleanup(void)
 {
        GSList *l;
 
@@ -136,10 +136,10 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int hw_dev_open(struct sr_dev_inst *sdi)
+static int dev_open(struct sr_dev_inst *sdi)
 {
        if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdev)))) {
-               sr_err("%s: sdi->priv malloc failed", __func__);
+               sr_err("Device context malloc failed.");
                return SR_ERR_MALLOC;
        }
 
@@ -161,7 +161,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
                        return SR_ERR;
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
@@ -193,8 +193,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
                vdev->num_probes = g_variant_get_uint64(data);
                break;
        default:
-               sr_err("Unknown capability: %d.", id);
-               return SR_ERR;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
@@ -211,14 +210,13 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
                                hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
 }
 
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-               void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
        struct zip_stat zs;
        struct session_vdev *vdev;
@@ -261,13 +259,17 @@ SR_PRIV struct sr_dev_driver session_driver = {
        .name = "virtual-session",
        .longname = "Session-emulating driver",
        .api_version = 1,
-       .init = hw_init,
-       .cleanup = hw_cleanup,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = NULL,
+       .dev_list = NULL,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
-       .dev_open = hw_dev_open,
+       .dev_open = dev_open,
        .dev_close = NULL,
-       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = NULL,
+       .priv = NULL,
 };