(void)options;
- devcnt = 0;
- devices = 0;
drvc = di->priv;
drvc->instances = NULL;
+ devcnt = 0;
+ devices = 0;
+
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
return SR_OK;
}
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
- uint64_t tmp;
-
- (void)sdi;
-
- switch (id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_BUFFERSIZES:
- *data = buffersizes;
- break;
- case SR_DI_TIMEBASES:
- *data = timebases;
- break;
- case SR_DI_TRIGGER_SOURCES:
- *data = trigger_sources;
- break;
- case SR_DI_FILTERS:
- *data = filter_targets;
- break;
- case SR_DI_VDIVS:
- *data = vdivs;
- break;
- case SR_DI_COUPLING:
- *data = coupling;
- break;
- /* TODO remove this */
- case SR_DI_CUR_SAMPLERATE:
- *data = &tmp;
- break;
- default:
- return SR_ERR_ARG;
- }
-
- return SR_OK;
-}
-
static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
return ret;
}
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = hwcaps;
+ break;
+ case SR_CONF_BUFFERSIZE:
+ *data = buffersizes;
+ break;
+ case SR_CONF_COUPLING:
+ *data = coupling;
+ break;
+ case SR_CONF_VDIV:
+ *data = vdivs;
+ break;
+ case SR_CONF_FILTER:
+ *data = filter_targets;
+ break;
+ case SR_CONF_TIMEBASE:
+ *data = timebases;
+ break;
+ case SR_CONF_TRIGGER_SOURCE:
+ *data = trigger_sources;
+ break;
+ default:
+ return SR_ERR_ARG;
+ }
+
+ return SR_OK;
+}
+
static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
int num_samples)
{
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = clear_instances,
- .config_get = config_get,
.config_set = config_set,
+ .config_list = config_list,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.dev_acquisition_start = hw_dev_acquisition_start,