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

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

This commit is contained in:
Bert Vermeulen 2012-07-15 04:31:58 +02:00
parent 7566601c21
commit 46c7a4daa7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/demo/demo.c
View File

@ -204,6 +204,9 @@ static int hw_info_get(int info_id, const void **data,
case SR_DI_INST: case SR_DI_INST:
*data = sdi; *data = sdi;
break; break;
case SR_DI_HWCAPS:
*data = hwcaps;
break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:
*data = GINT_TO_POINTER(NUM_PROBES); *data = GINT_TO_POINTER(NUM_PROBES);
break; break;
@ -234,11 +237,6 @@ static int hw_dev_status_get(int dev_index)
return SR_ST_ACTIVE; return SR_ST_ACTIVE;
} }
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)
{ {
int ret; int ret;
@ -526,7 +524,6 @@ SR_PRIV struct sr_dev_driver demo_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,