sr_dev_close(): Set status to SR_ST_INACTIVE.

[libsigrok.git] / src / hardware / pipistrello-ols / api.c

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 86ad7f9f1817583df1fbc89f2640ce81fca841cd..7dd94f8c355dc5dfd418972e95aab27ef76914c4 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -75,17 +75,9 @@ static const uint64_t samplerates[] = {
        SR_HZ(1),
 };
 
-SR_PRIV struct sr_dev_driver p_ols_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
        GSList *devices;
        int ret, i;
@@ -94,8 +86,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        (void)options;
 
-       drvc = di->context;
-
        devices = NULL;
 
        /* Allocate memory for our private device context. */
@@ -123,7 +113,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (p_ols_open(devc) != SR_OK) {
                goto err_free_ftdic;
        }
-       
+
        /* The discovery procedure is like this: first send the Reset
         * command (0x00) 5 times, since the device could be anywhere
         * in a 5-byte command. Then send the ID command (0x02).
@@ -184,10 +174,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sr_dbg("Failed to set default samplerate (%"PRIu64").",
                                DEFAULT_SAMPLERATE);
 
-       drvc->instances = g_slist_append(drvc->instances, sdi);
        devices = g_slist_append(devices, sdi);
 
-       return devices;
+       return std_scan_complete(di, devices);
 
 err_close_ftdic:
        p_ols_close(devc);
@@ -200,11 +189,6 @@ err_free_ftdi_buf:
        return NULL;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
 static void clear_helper(void *priv)
 {
        struct dev_context *devc;
@@ -273,9 +257,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        switch (key) {
@@ -430,32 +411,16 @@ static int dev_open(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       if (p_ols_open(devc) != SR_OK) {
-               return SR_ERR;
-       } else {
-               sdi->status = SR_ST_ACTIVE;
-               return SR_OK;
-       }
+       return p_ols_open(devc);
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       int ret;
        struct dev_context *devc;
 
-       ret = SR_OK;
        devc = sdi->priv;
 
-       if (sdi->status == SR_ST_ACTIVE) {
-               sr_dbg("Status ACTIVE, closing device.");
-               ret = p_ols_close(devc);
-       } else {
-               sr_spew("Status not ACTIVE, nothing to do.");
-       }
-
-       sdi->status = SR_ST_INACTIVE;
-
-       return ret;
+       return p_ols_close(devc);
 }
 
 static int set_trigger(const struct sr_dev_inst *sdi, int stage)
@@ -539,9 +504,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        int num_pols_changrp, samplespercount;
        int ret, i;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        pols_channel_mask(sdi);
@@ -658,8 +620,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        sr_dbg("flag_reg = %x", devc->flag_reg);
 
        /*
-       * In demux mode the OLS is processing two 8-bit or 16-bit samples 
-       * in parallel and for this to work the lower two bits of the four 
+       * In demux mode the OLS is processing two 8-bit or 16-bit samples
+       * in parallel and for this to work the lower two bits of the four
        * "channel_disable" bits must be replicated to the upper two bits.
        */
        flag_tmp = devc->flag_reg;
@@ -683,7 +645,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc->cnt_bytes = devc->cnt_samples = devc->cnt_samples_rle = 0;
        memset(devc->sample, 0, 4);
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Hook up a dummy handler to receive data from the device. */
        sr_session_source_add(sdi->session, -1, 0, 10, p_ols_receive_data,
@@ -698,7 +660,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       sr_dbg("Stopping acquisition.");
        write_shortcommand(devc, CMD_RESET);
        write_shortcommand(devc, CMD_RESET);
        write_shortcommand(devc, CMD_RESET);
@@ -707,7 +668,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
        sr_session_source_remove(sdi->session, -1);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        return SR_OK;
 }
@@ -716,10 +677,10 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
        .name = "p-ols",
        .longname = "Pipistrello OLS",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
+       .dev_list = std_dev_list,
        .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
@@ -730,3 +691,4 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(p_ols_driver_info);