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

fx2lafw: don't use deprecated hwcap_get_all() driver API call

This commit is contained in:
Bert Vermeulen 2012-07-13 02:31:16 +02:00
parent c5e82ca5e3
commit a27999e657
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hardware/fx2lafw/fx2lafw.c
View File

@ -618,7 +618,14 @@ static int hw_info_get(int dev_info_id, const void **data,
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INST: case SR_DI_INST:
return sdi; *data = sdi;
break;
case SR_DI_HWOPTS:
*data = NULL;
break;
case SR_DI_HWCAPS:
*data = hwcaps;
break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:
if (sdi) { if (sdi) {
ctx = sdi->priv; ctx = sdi->priv;
@ -662,11 +669,6 @@ static int hw_dev_status_get(int dev_index)
return sdi->status; return sdi->status;
} }
static const int *hw_hwcap_get_all(void)
{
return hwcaps;
}
static int hw_dev_config_set(int dev_index, int hwcap, const void *value) static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
@ -1057,7 +1059,6 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
.dev_close = hw_dev_close, .dev_close = hw_dev_close,
.info_get = hw_info_get, .info_get = hw_info_get,
.dev_status_get = hw_dev_status_get, .dev_status_get = hw_dev_status_get,
.hwcap_get_all = hw_hwcap_get_all,
.dev_config_set = hw_dev_config_set, .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop, .dev_acquisition_stop = hw_dev_acquisition_stop,