X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fdemo.c;h=0704cde20c569735f771f1953d3bf5418be218cc;hp=fb1bb05fa5091125b0adbd00294ebaff37a8d29f;hb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;hpb=9e60a31fb954493754770fe2192db74b947c6867 diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c index fb1bb05f..0704cde2 100644 --- a/src/hardware/demo/demo.c +++ b/src/hardware/demo/demo.c @@ -180,12 +180,11 @@ static uint8_t pattern_sigrok[] = { }; SR_PRIV struct sr_dev_driver demo_driver_info; -static struct sr_dev_driver *di = &demo_driver_info; static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } @@ -266,7 +265,7 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate) } } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct drv_context *drvc; struct dev_context *devc; @@ -369,7 +368,7 @@ static GSList *scan(GSList *options) return devices; } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { return ((struct drv_context *)(di->priv))->instances; } @@ -404,7 +403,7 @@ static void clear_helper(void *priv) g_free(devc); } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { return std_dev_clear(di, clear_helper); }