sr: Fix/document probe names.

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 1ddd2cc24444c4a3e7eea36f0ff9cec598661b33..2c066f9454553ac757f30ab6115fc3c7b728afa9 100644 (file)
--- a/session.c
+++ b/session.c
@@ -114,7 +114,7 @@ SR_API int sr_session_dev_clear(void)
  * Add a device to the current session.
  *
  * @param dev The device to add to the current session. Must not be NULL.
- *            Also, dev->plugin and dev->plugin->opendev must not be NULL.
+ *            Also, dev->plugin and dev->plugin->dev_open must not be NULL.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
  */
@@ -132,8 +132,8 @@ SR_API int sr_session_dev_add(struct sr_dev *dev)
                return SR_ERR_ARG;
        }
 
-       if (!dev->plugin->opendev) {
-               sr_err("session: %s: dev->plugin->opendev was NULL",
+       if (!dev->plugin->dev_open) {
+               sr_err("session: %s: dev->plugin->dev_open was NULL",
                       __func__);
                return SR_ERR_ARG;
        }
@@ -143,8 +143,8 @@ SR_API int sr_session_dev_add(struct sr_dev *dev)
                return SR_ERR; /* TODO: SR_ERR_BUG? */
        }
 
-       if ((ret = dev->plugin->opendev(dev->plugin_index)) != SR_OK) {
-               sr_err("session: %s: opendev failed (%d)", __func__, ret);
+       if ((ret = dev->plugin->dev_open(dev->plugin_index)) != SR_OK) {
+               sr_err("session: %s: dev_open failed (%d)", __func__, ret);
                return ret;
        }
 
@@ -276,7 +276,7 @@ SR_API int sr_session_start(void)
        for (l = session->devs; l; l = l->next) {
                dev = l->data;
                /* TODO: Check for dev != NULL. */
-               if ((ret = dev->plugin->start_acquisition(
+               if ((ret = dev->plugin->dev_acquisition_start(
                                dev->plugin_index, dev)) != SR_OK) {
                        sr_err("session: %s: could not start an acquisition "
                               "(%d)", __func__, ret);
@@ -373,8 +373,8 @@ SR_API int sr_session_stop(void)
                dev = l->data;
                /* Check for dev != NULL. */
                if (dev->plugin) {
-                       if (dev->plugin->stop_acquisition)
-                               dev->plugin->stop_acquisition(dev->plugin_index, dev);
+                       if (dev->plugin->dev_acquisition_stop)
+                               dev->plugin->dev_acquisition_stop(dev->plugin_index, dev);
                        if (dev->plugin->cleanup)
                                dev->plugin->cleanup();
                }