sr: Name all callback data 'cb_data'.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 647de88221a364d79f4ae6167d67e41d4acd18df..a69e404d42af4d076195ff56b0541deb29357c79 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -41,7 +41,7 @@ struct session_vdev {
 
 static char *sessionfile = NULL;
 static GSList *dev_insts = NULL;
-static int capabilities[] = {
+static int hwcaps[] = {
        SR_HWCAP_CAPTUREFILE,
        SR_HWCAP_CAPTURE_UNITSIZE,
        0,
@@ -120,7 +120,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
                        logic.unitsize = vdev->unitsize;
                        logic.data = buf;
                        vdev->bytes_read += ret;
-                       sr_session_bus(session_data, &packet);
+                       sr_session_send(session_data, &packet);
                } else {
                        /* done with this capture file */
                        zip_fclose(vdev->capfile);
@@ -132,7 +132,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
 
        if (!got_data) {
                packet.type = SR_DF_END;
-               sr_session_bus(session_data, &packet);
+               sr_session_send(session_data, &packet);
        }
 
        return TRUE;
@@ -175,7 +175,7 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
 {
        struct sr_dev_inst *sdi;
 
@@ -194,7 +194,7 @@ static int hw_opendev(int dev_index)
        return SR_OK;
 }
 
-static void *hw_get_dev_info(int dev_index, int dev_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct session_vdev *vdev;
        void *info;
@@ -210,7 +210,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
        return info;
 }
 
-static int hw_get_status(int dev_index)
+static int hw_dev_status_get(int dev_index)
 {
        /* Avoid compiler warnings. */
        (void)dev_index;
@@ -227,12 +227,12 @@ static int hw_get_status(int dev_index)
  * @return A pointer to the (hardware) capabilities of this virtual session
  *         driver. This could be NULL, if no such capabilities exist.
  */
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-       return capabilities;
+       return hwcaps;
 }
 
-static int hw_set_configuration(int dev_index, int capability, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 {
        struct session_vdev *vdev;
        uint64_t *tmp_u64;
@@ -240,7 +240,7 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
        if (!(vdev = get_vdev_by_index(dev_index)))
                return SR_ERR;
 
-       switch (capability) {
+       switch (hwcap) {
        case SR_HWCAP_SAMPLERATE:
                tmp_u64 = value;
                vdev->samplerate = *tmp_u64;
@@ -262,14 +262,14 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
                break;
        default:
                sr_err("session driver: %s: unknown capability %d requested",
-                      __func__, capability);
+                      __func__, hwcap);
                return SR_ERR;
        }
 
        return SR_OK;
 }
 
-static int hw_start_acquisition(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, void *session_dev_id)
 {
        struct zip_stat zs;
        struct session_vdev *vdev;
@@ -324,25 +324,25 @@ static int hw_start_acquisition(int dev_index, gpointer session_dev_id)
        gettimeofday(&header->starttime, NULL);
        header->samplerate = vdev->samplerate;
        header->num_logic_probes = vdev->num_probes;
-       sr_session_bus(session_dev_id, packet);
+       sr_session_send(session_dev_id, packet);
        g_free(header);
        g_free(packet);
 
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_plugin session_driver = {
-       "session",
-       "Session-emulating driver",
-       1,
-       hw_init,
-       hw_cleanup,
-       hw_opendev,
-       NULL,
-       hw_get_dev_info,
-       hw_get_status,
-       hw_get_capabilities,
-       hw_set_configuration,
-       hw_start_acquisition,
-       NULL,
+SR_PRIV struct sr_dev_driver session_driver = {
+       .name = "session",
+       .longname = "Session-emulating driver",
+       .api_version = 1,
+       .init = hw_init,
+       .cleanup = hw_cleanup,
+       .dev_open = hw_dev_open,
+       .dev_close = NULL,
+       .dev_info_get = hw_dev_info_get,
+       .dev_status_get = hw_dev_status_get,
+       .hwcap_get_all = hw_hwcap_get_all,
+       .dev_config_set = hw_dev_config_set,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = NULL,
 };