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

demo: use driver struct-based device instance list

This commit is contained in:
Bert Vermeulen 2012-07-13 13:47:27 +02:00
parent 3275654708
commit dcf03d6dbd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/demo/demo.c
View File

@ -130,7 +130,8 @@ static uint8_t pattern_sigrok[] = {
/* TODO: struct context as with the other drivers. */
/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
static GSList *dev_insts = NULL;
SR_PRIV struct sr_dev_driver demo_driver_info;
static struct sr_dev_driver *ddi = &demo_driver_info;
static uint64_t cur_samplerate = SR_KHZ(200);
static uint64_t limit_samples = 0;
static uint64_t limit_msec = 0;
@ -158,7 +159,7 @@ static int hw_scan(void)
return 0;
}
dev_insts = g_slist_append(dev_insts, sdi);
ddi->instances = g_slist_append(ddi->instances, sdi);
return 1;
}
@ -194,7 +195,7 @@ static const void *hw_dev_info_get(int dev_index, int dev_info_id)
struct sr_dev_inst *sdi;
const void *info = NULL;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
if (!(sdi = sr_dev_inst_get(ddi->instances, dev_index))) {
sr_err("demo: %s: sdi was NULL", __func__);
return NULL;
}
@ -527,4 +528,5 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.instances = NULL,
};