sr: opendev/closedev -> dev_open/dev_close.

[libsigrok.git] / hardware / chronovu-la8 / chronovu-la8.c

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index 6ce6eb4b41078f2b4ef76c057d2d838369955bc2..b551fb7ed6b73c0864d24ddff9f686291bb5ce25 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -550,7 +550,7 @@ err_free_nothing:
        return 0;
 }
 
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
 {
        int ret;
        struct sr_dev_inst *sdi;
@@ -583,7 +583,7 @@ static int hw_opendev(int dev_index)
                sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
                       __func__, ret, ftdi_get_error_string(la8->ftdic));
                (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
-               goto err_opendev_close_ftdic;
+               goto err_dev_open_close_ftdic;
        }
        sr_dbg("la8: FTDI buffers purged successfully");
 
@@ -592,7 +592,7 @@ static int hw_opendev(int dev_index)
                sr_err("la8: %s: ftdi_setflowcontrol: (%d) %s",
                       __func__, ret, ftdi_get_error_string(la8->ftdic));
                (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
-               goto err_opendev_close_ftdic;
+               goto err_dev_open_close_ftdic;
        }
        sr_dbg("la8: FTDI flow control enabled successfully");
 
@@ -603,7 +603,7 @@ static int hw_opendev(int dev_index)
 
        return SR_OK;
 
-err_opendev_close_ftdic:
+err_dev_open_close_ftdic:
        (void) la8_close(la8); /* Log, but ignore errors. */
        return SR_ERR;
 }
@@ -638,7 +638,7 @@ static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
        return SR_OK;
 }
 
-static int hw_closedev(int dev_index)
+static int hw_dev_close(int dev_index)
 {
        struct sr_dev_inst *sdi;
        struct la8 *la8;
@@ -741,7 +741,7 @@ static void *hw_dev_info_get(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)
 {
        struct sr_dev_inst *sdi;
 
@@ -1119,10 +1119,10 @@ SR_PRIV struct sr_dev_plugin chronovu_la8_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .opendev = hw_opendev,
-       .closedev = hw_closedev,
+       .dev_open = hw_dev_open,
+       .dev_close = hw_dev_close,
        .dev_info_get = hw_dev_info_get,
-       .get_status = hw_get_status,
+       .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
        .acquisition_start = hw_acquisition_start,