beaglelogic: Update copyright notices in all files

[libsigrok.git] / src / hardware / beaglelogic / api.c

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index b933965dab0470882dae4224088ea45ccbca8450..b2384d5f33b55557f11f65d85348715aa4e17a47 100644 (file)
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) 2014 Kumar Abhishek <abhishek@theembeddedkitchen.net>
+ * Copyright (C) 2014-17 Kumar Abhishek <abhishek@theembeddedkitchen.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ static const uint32_t drvopts[] = {
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
        SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET,
@@ -67,7 +67,7 @@ static struct dev_context *beaglelogic_devc_alloc(void)
 
        /* Default non-zero values (if any) */
        devc->fd = -1;
-       devc->limit_samples = (uint64_t)-1;
+       devc->limit_samples = (uint64_t)10000000;
        devc->tcp_buffer = 0;
 
        return devc;
@@ -136,6 +136,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        goto err_free;
                if (beaglelogic_tcp_detect(devc) != SR_OK)
                        goto err_free;
+               if (devc->beaglelogic->close(devc) != SR_OK)
+                       goto err_free;
                sr_info("BeagleLogic device found at %s : %s",
                        devc->address, devc->port);
        }
@@ -150,6 +152,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 err_free:
        g_free(sdi->model);
        g_free(sdi->version);
+       g_free(devc->address);
+       g_free(devc->port);
        g_free(devc);
        g_free(sdi);
 
@@ -161,9 +165,8 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct dev_context *devc = sdi->priv;
 
        /* Open BeagleLogic */
-       if (devc->beaglelogic == &beaglelogic_native_ops)
-               if (devc->beaglelogic->open(devc))
-                       return SR_ERR;
+       if (devc->beaglelogic->open(devc))
+               return SR_ERR;
 
        /* Set fd and local attributes */
        if (devc->beaglelogic == &beaglelogic_tcp_ops)
@@ -207,10 +210,24 @@ static int dev_close(struct sr_dev_inst *sdi)
                devc->beaglelogic->munmap(devc);
        devc->beaglelogic->close(devc);
 
+       return SR_OK;
+}
+
+static void clear_helper(struct dev_context *devc)
+{
        if (devc->tcp_buffer)
                g_free(devc->tcp_buffer);
 
-       return SR_OK;
+       if (devc->address)
+               g_free(devc->address);
+
+       if (devc->port)
+               g_free(devc->port);
+}
+
+static int dev_clear(const struct sr_dev_driver *di)
+{
+       return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data,
@@ -379,7 +396,7 @@ static struct sr_dev_driver beaglelogic_driver_info = {
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
-       .dev_clear = std_dev_clear,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,