uint8_t divcount;
};
-/* This will be initialized via hw_get_dev_info()/SR_DI_SAMPLERATES. */
+/* This will be initialized via hw_dev_info_get()/SR_DI_SAMPLERATES. */
static uint64_t supported_samplerates[255 + 1] = { 0 };
/*
/* Function prototypes. */
static int la8_close_usb_reset_sequencer(struct la8 *la8);
-static int hw_stop_acquisition(int dev_index, gpointer session_data);
+static int hw_acquisition_stop(int dev_index, gpointer session_data);
static int la8_reset(struct la8 *la8);
static void fill_supported_samplerates_if_needed(void)
return 0;
}
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
{
int ret;
struct sr_dev_inst *sdi;
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");
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");
return SR_OK;
-err_opendev_close_ftdic:
+err_dev_open_close_ftdic:
(void) la8_close(la8); /* Log, but ignore errors. */
return SR_ERR;
}
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;
return ret;
}
-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 sr_dev_inst *sdi;
struct la8 *la8;
return info;
}
-static int hw_get_status(int dev_index)
+static int hw_dev_status_get(int dev_index)
{
struct sr_dev_inst *sdi;
return hwcaps;
}
-static int hw_set_configuration(int dev_index, int hwcap, void *value)
+static int hw_config_set(int dev_index, int hwcap, void *value)
{
struct sr_dev_inst *sdi;
struct la8 *la8;
/* Get one block of data. */
if ((ret = la8_read_block(la8)) < 0) {
sr_err("la8: %s: la8_read_block error: %d", __func__, ret);
- hw_stop_acquisition(sdi->index, session_data);
+ hw_acquisition_stop(sdi->index, session_data);
return FALSE;
}
for (i = 0; i < NUM_BLOCKS; i++)
send_block_to_session_bus(la8, i);
- hw_stop_acquisition(sdi->index, session_data);
+ hw_acquisition_stop(sdi->index, session_data);
// return FALSE; /* FIXME? */
return TRUE;
}
-static int hw_start_acquisition(int dev_index, gpointer session_data)
+static int hw_acquisition_start(int dev_index, gpointer session_data)
{
struct sr_dev_inst *sdi;
struct la8 *la8;
return SR_OK;
}
-static int hw_stop_acquisition(int dev_index, gpointer session_data)
+static int hw_acquisition_stop(int dev_index, gpointer session_data)
{
struct sr_dev_inst *sdi;
struct la8 *la8;
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
- .opendev = hw_opendev,
- .closedev = hw_closedev,
- .get_dev_info = hw_get_dev_info,
- .get_status = hw_get_status,
+ .dev_open = hw_dev_open,
+ .dev_close = hw_dev_close,
+ .dev_info_get = hw_dev_info_get,
+ .dev_status_get = hw_dev_status_get,
.hwcap_get_all = hw_hwcap_get_all,
- .set_configuration = hw_set_configuration,
- .start_acquisition = hw_start_acquisition,
- .stop_acquisition = hw_stop_acquisition,
+ .config_set = hw_config_set,
+ .acquisition_start = hw_acquisition_start,
+ .acquisition_stop = hw_acquisition_stop,
};