kingst-la2016: fix segfault that often occurs when a capture is aborted

[libsigrok.git] / tests / lib.c

diff --git a/tests/lib.c b/tests/lib.c
index cdaff77126fb2dcc672d2833ffe8b63a65a62bf0..15beca27ae60096e070ff8bb41eb8be4716dc5e6 100644 (file)
--- a/tests/lib.c
+++ b/tests/lib.c
@@ -14,16 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <check.h>
-#include "../include/libsigrok/libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "lib.h"
 
 struct sr_context *srtest_ctx;
@@ -50,7 +50,7 @@ struct sr_dev_driver *srtest_driver_get(const char *drivername)
        struct sr_dev_driver **drivers, *driver = NULL;
        int i;
 
-       drivers = sr_driver_list();
+       drivers = sr_driver_list(srtest_ctx);
        fail_unless(drivers != NULL, "No drivers found.");
 
        for (i = 0; drivers[i]; i++) {
@@ -79,7 +79,7 @@ void srtest_driver_init_all(struct sr_context *sr_ctx)
        struct sr_dev_driver **drivers, *driver;
        int i, ret;
 
-       drivers = sr_driver_list();
+       drivers = sr_driver_list(srtest_ctx);
        fail_unless(drivers != NULL, "No drivers found.");
 
        for (i = 0; drivers[i]; i++) {
@@ -97,7 +97,7 @@ void srtest_set_samplerate(struct sr_dev_driver *driver, uint64_t samplerate)
        struct sr_dev_inst *sdi;
        GVariant *gvar;
 
-       sdi = g_slist_nth_data(driver->priv, 0);
+       sdi = g_slist_nth_data(driver->context, 0);
 
        gvar = g_variant_new_uint64(samplerate);
        ret = driver->config_set(SR_CONF_SAMPLERATE, gvar, sdi, NULL);
@@ -115,7 +115,7 @@ uint64_t srtest_get_samplerate(struct sr_dev_driver *driver)
        struct sr_dev_inst *sdi;
        GVariant *gvar;
 
-       sdi = g_slist_nth_data(driver->priv, 0);
+       sdi = g_slist_nth_data(driver->context, 0);
 
        ret = driver->config_get(SR_CONF_SAMPLERATE, &gvar, sdi, NULL);
        samplerate = g_variant_get_uint64(gvar);
@@ -149,7 +149,7 @@ GArray *srtest_get_enabled_logic_channels(const struct sr_dev_inst *sdi)
        GSList *l;
 
        channels = g_array_new(FALSE, FALSE, sizeof(int));
-       for (l = sdi->channels; l; l = l->next) {
+       for (l = sr_dev_inst_channels_get(sdi); l; l = l->next) {
                ch = l->data;
                if (ch->type != SR_CHANNEL_LOGIC)
                        continue;