libsigrok: Rename open/close to opendev/closedev.

diff --git a/device.c b/device.c
index fc2635b59750c8bcfc52834e6c3c29321ab469d9..a1556aa4e37244cb57bdf97f7ec644771cc70b7a 100644 (file)
--- a/device.c
+++ b/device.c
@@ -65,8 +65,8 @@ void sr_device_close_all(void)
 
        while (devices) {
                device = devices->data;
-               if (device->plugin && device->plugin->close)
-                       device->plugin->close(device->plugin_index);
+               if (device->plugin && device->plugin->closedev)
+                       device->plugin->closedev(device->plugin_index);
                sr_device_destroy(device);
        }
 }

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index f567e43aeb16ad8233fc3eccab0c66cc70a5476c..95161b7ab8c3bd1df625c7f3a58a0d8c93d6054e 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -364,8 +364,8 @@ struct sr_device_plugin alsa_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 76b046a0592e221984ba47d2bb0a709847345e24..50bb932db26030405a611ebd684c916a8ff02521 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -1367,8 +1367,8 @@ struct sr_device_plugin asix_sigma_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index da9eea9b714cb97cb2e9042f226cae358b08feea..d2f07b10eb43b5c8429228951f42f644284619d7 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -1028,8 +1028,8 @@ struct sr_device_plugin chronovu_la8_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 7085586692f51f0ba88263d6f097aa59bbe88044..f28fa525110e7164c664a608a6b085f1f28ddee4 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -429,8 +429,8 @@ struct sr_device_plugin demo_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index efafb0a314a876ca8cf02ce7b2dcb39363c9722a..d37ba02077a06cced83879fef655a61a667a9dc3 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -779,8 +779,8 @@ struct sr_device_plugin link_mso19_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index d4d17688c92bf72f298fe03057b857a11fb17630..d2d49768eb0e93397862a68c1d290d10082918e1 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -952,8 +952,8 @@ struct sr_device_plugin ols_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 379da2008a766ac3dede288cea525678bd5f6098..173e8adaa8456cd7ef226ec91f166da0f3f95c8e 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -759,8 +759,8 @@ struct sr_device_plugin saleae_logic_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 54d888b07f5a7d9a3b540336bf4b935d88c6abb9..9b867dca43e134da40f30a3d989caad7ddaef0d9 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -570,8 +570,8 @@ struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,

diff --git a/session.c b/session.c
index 6e597ab34dd87065a0fc3bd23e16d2b4c45abb11..b80ab7d59f489ff4bcd3e87918a2e3454b2ee806 100644 (file)
--- a/session.c
+++ b/session.c
@@ -71,8 +71,8 @@ int sr_session_device_add(struct sr_device *device)
 {
        int ret;
 
-       if (device->plugin && device->plugin->open) {
-               ret = device->plugin->open(device->plugin_index);
+       if (device->plugin && device->plugin->opendev) {
+               ret = device->plugin->opendev(device->plugin_index);
                if (ret != SR_OK)
                        return ret;
        }

diff --git a/sigrok.h b/sigrok.h
index e839c4844c9d40a67af9ed4a99cad4219ded9680..2fd171198e63e6d822d39b7d87a6692bb7164910 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -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);