scan(): Consistently start out with SR_ST_INACTIVE.

[libsigrok.git] / src / hardware / demo / demo.c

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 50780214d72787a0da64e5223412128d879e2abb..0a220fe759fbe64df9aed7d3656dceac01166a59 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -137,7 +137,7 @@ static const uint32_t scanopts[] = {
 };
 
 static const uint32_t devopts[] = {
-       SR_CONF_CONTINUOUS | SR_CONF_SET,
+       SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@@ -177,12 +177,7 @@ static const uint8_t pattern_sigrok[] = {
 
 SR_PRIV struct sr_dev_driver demo_driver_info;
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
+static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
 {
@@ -289,7 +284,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        devices = NULL;
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
-       sdi->status = SR_ST_ACTIVE;
+       sdi->status = SR_ST_INACTIVE;
        sdi->model = g_strdup("Demo device");
        sdi->driver = di;
 
@@ -354,11 +349,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
        sdi->status = SR_ST_ACTIVE;
@@ -389,7 +379,7 @@ static void clear_helper(void *priv)
        g_free(devc);
 }
 
-static int cleanup(const struct sr_dev_driver *di)
+static int dev_clear(const struct sr_dev_driver *di)
 {
        return std_dev_clear(di, clear_helper);
 }
@@ -757,7 +747,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
        if (devc->cur_samplerate <= 0 || devc->logic_unitsize <= 0
                        || (devc->num_logic_channels <= 0
                        && devc->num_analog_channels <= 0)) {
-               dev_acquisition_stop(sdi, sdi);
+               dev_acquisition_stop(sdi);
                return G_SOURCE_CONTINUE;
        }
 
@@ -841,20 +831,18 @@ static int prepare_data(int fd, int revents, void *cb_data)
                        }
                }
                sr_dbg("Requested number of samples reached.");
-               dev_acquisition_stop(sdi, sdi);
+               dev_acquisition_stop(sdi);
        }
 
        return G_SOURCE_CONTINUE;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        GHashTableIter iter;
        void *value;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -877,10 +865,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       (void)cb_data;
-
        sr_dbg("Stopping acquisition.");
        sr_session_source_remove(sdi->session, -1);
        std_session_send_df_end(sdi, LOG_PREFIX);
@@ -892,11 +878,11 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .name = "demo",
        .longname = "Demo driver and pattern generator",
        .api_version = 1,
-       .init = init,
-       .cleanup = cleanup,
+       .init = std_init,
+       .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
-       .dev_clear = NULL,
+       .dev_list = std_dev_list,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,