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

session_driver: remove unneeded callbacks

This commit is contained in:
Bert Vermeulen 2011-02-01 00:06:32 +01:00
parent dd56a9320d
commit b8c2f85f56
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device.c
View File

@ -64,7 +64,7 @@ void device_close_all(void)
while (devices) { while (devices) {
device = devices->data; device = devices->data;
if (device->plugin) if (device->plugin && device->plugin->close)
device->plugin->close(device->plugin_index); device->plugin->close(device->plugin_index);
device_destroy(device); device_destroy(device);
} }

2
session.c
View File

@ -201,7 +201,7 @@ void session_stop(void)
session->running = FALSE; session->running = FALSE;
for (l = session->devices; l; l = l->next) { for (l = session->devices; l; l = l->next) {
device = l->data; device = l->data;
if (device->plugin) if (device->plugin && device->plugin->stop_acquisition)
device->plugin->stop_acquisition(device->plugin_index, device); device->plugin->stop_acquisition(device->plugin_index, device);
} }

28
session_driver.c
View File

@ -146,19 +146,14 @@ static int hw_opendev(int device_index)
return SR_OK; return SR_OK;
} }
static void hw_closedev(int device_index)
{
/* avoid compiler warning */
device_index = device_index;
}
static void *hw_get_device_info(int device_index, int device_info_id) static void *hw_get_device_info(int device_index, int device_info_id)
{ {
struct session_vdevice *vdevice; struct session_vdevice *vdevice;
void *info; void *info;
if (device_info_id != SR_DI_CUR_SAMPLERATE)
return NULL;
if (!(vdevice = get_vdevice_by_index(device_index))) if (!(vdevice = get_vdevice_by_index(device_index)))
return NULL; return NULL;
@ -275,19 +270,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
return SR_OK; return SR_OK;
} }
static void hw_stop_acquisition(int device_index, gpointer session_device_id)
{
struct session_vdevice *vdevice;
/* avoid compiler warning */
session_device_id = session_device_id;
// vdevice = get_vdevice_by_index(device_index);
// zip_fclose(vdevice->capfile);
// zip_close(vdevice->archive);
}
struct sr_device_plugin session_driver = { struct sr_device_plugin session_driver = {
"session", "session",
@ -296,11 +278,11 @@ struct sr_device_plugin session_driver = {
hw_init, hw_init,
hw_cleanup, hw_cleanup,
hw_opendev, hw_opendev,
hw_closedev, NULL,
hw_get_device_info, hw_get_device_info,
hw_get_status, hw_get_status,
hw_get_capabilities, hw_get_capabilities,
hw_set_configuration, hw_set_configuration,
hw_start_acquisition, hw_start_acquisition,
hw_stop_acquisition, NULL
}; };