#define O_NONBLOCK FIONBIO
#endif
-static int capabilities[] = {
+static int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_CAPTURE_RATIO,
return final_devcnt;
}
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
{
struct sr_dev_inst *sdi;
struct ols_dev *ols;
return SR_OK;
}
-static int hw_closedev(int dev_index)
+static int hw_dev_close(int dev_index)
{
struct sr_dev_inst *sdi;
struct ols_dev *ols;
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 ols_dev *ols;
info = NULL;
switch (dev_info_id) {
- case SR_DI_INSTANCE:
+ case SR_DI_INST:
info = sdi;
break;
case SR_DI_NUM_PROBES:
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 sdi->status;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
}
-static int set_configuration_samplerate(struct sr_dev_inst *sdi,
- uint64_t samplerate)
+static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{
struct ols_dev *ols;
return SR_OK;
}
-static int hw_set_configuration(int dev_index, int capability, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, void *value)
{
struct sr_dev_inst *sdi;
struct ols_dev *ols;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
- switch (capability) {
+ switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
tmp_u64 = value;
- ret = set_configuration_samplerate(sdi, *tmp_u64);
+ ret = set_samplerate(sdi, *tmp_u64);
break;
case SR_HWCAP_PROBECONFIG:
ret = configure_probes(ols, (GSList *) value);
return TRUE;
}
-static int hw_start_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
return SR_OK;
}
-static int hw_stop_acquisition(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
{
struct sr_datafeed_packet packet;
.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,
- .get_capabilities = hw_get_capabilities,
- .set_configuration = hw_set_configuration,
- .start_acquisition = hw_start_acquisition,
- .stop_acquisition = hw_stop_acquisition,
+ .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,
+ .dev_config_set = hw_dev_config_set,
+ .dev_acquisition_start = hw_dev_acquisition_start,
+ .dev_acquisition_stop = hw_dev_acquisition_stop,
};