BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libsigrok: Rename open/close to opendev/closedev.

This commit is contained in:
Uwe Hermann 2011-05-03 19:15:54 +02:00
parent 6f42226475
commit 86f5e3d826
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device.c
View File

@ -65,8 +65,8 @@ void sr_device_close_all(void)
while (devices) { while (devices) {
device = devices->data; device = devices->data;
if (device->plugin && device->plugin->close) if (device->plugin && device->plugin->closedev)
device->plugin->close(device->plugin_index); device->plugin->closedev(device->plugin_index);
sr_device_destroy(device); sr_device_destroy(device);
} }
} }

4
hardware/alsa/alsa.c
View File

@ -364,8 +364,8 @@ struct sr_device_plugin alsa_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/asix-sigma/asix-sigma.c
View File

@ -1367,8 +1367,8 @@ struct sr_device_plugin asix_sigma_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/chronovu-la8/chronovu-la8.c
View File

@ -1028,8 +1028,8 @@ struct sr_device_plugin chronovu_la8_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/demo/demo.c
View File

@ -429,8 +429,8 @@ struct sr_device_plugin demo_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/link-mso19/link-mso19.c
View File

@ -779,8 +779,8 @@ struct sr_device_plugin link_mso19_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/openbench-logic-sniffer/ols.c
View File

@ -952,8 +952,8 @@ struct sr_device_plugin ols_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/saleae-logic/saleae-logic.c
View File

@ -759,8 +759,8 @@ struct sr_device_plugin saleae_logic_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -570,8 +570,8 @@ struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
.api_version = 1, .api_version = 1,
.init = hw_init, .init = hw_init,
.cleanup = hw_cleanup, .cleanup = hw_cleanup,
.open = hw_opendev, .opendev = hw_opendev,
.close = hw_closedev, .closedev = hw_closedev,
.get_device_info = hw_get_device_info, .get_device_info = hw_get_device_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.get_capabilities = hw_get_capabilities, .get_capabilities = hw_get_capabilities,

4
session.c
View File

@ -71,8 +71,8 @@ int sr_session_device_add(struct sr_device *device)
{ {
int ret; int ret;
if (device->plugin && device->plugin->open) { if (device->plugin && device->plugin->opendev) {
ret = device->plugin->open(device->plugin_index); ret = device->plugin->opendev(device->plugin_index);
if (ret != SR_OK) if (ret != SR_OK)
return ret; return ret;
} }

4
sigrok.h
View File

@ -327,8 +327,8 @@ struct sr_device_plugin {
void (*cleanup) (void); void (*cleanup) (void);
/* Device-specific */ /* Device-specific */
int (*open) (int device_index); int (*opendev) (int device_index);
void (*close) (int device_index); void (*closedev) (int device_index);
void *(*get_device_info) (int device_index, int device_info_id); void *(*get_device_info) (int device_index, int device_info_id);
int (*get_status) (int device_index); int (*get_status) (int device_index);
int *(*get_capabilities) (void); int *(*get_capabilities) (void);