X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fnexus-osciprime%2Fapi.c;h=1b9cf24b079b6973fa50f61311261f4d0bed6ab2;hp=dc97b9a720f864a326adc4fb465f202d5d316feb;hb=035a1078fda93cf1da37d19b3a1d95311b99b00f;hpb=69e19dd7691f86ac001469d1b319e1358e0d9778 diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c index dc97b9a7..1b9cf24b 100644 --- a/hardware/nexus-osciprime/api.c +++ b/hardware/nexus-osciprime/api.c @@ -265,14 +265,13 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { /* TODO */ (void)data; (void)sdi; - switch (info_id) { + switch (id) { default: return SR_ERR_ARG; } @@ -280,8 +279,7 @@ static int hw_info_get(int info_id, const void **data, return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { int ret; @@ -294,10 +292,10 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, } ret = SR_OK; - switch (hwcap) { + switch (id) { default: - sr_err("Unknown hardware capability: %d.", hwcap); + sr_err("Unknown hardware capability: %d.", id); ret = SR_ERR_ARG; } @@ -337,10 +335,10 @@ SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = config_get, + .config_set = config_set, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,