sr: rename more functions to sr_thing_action format

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 7ca8d353a4955de1b30bc5a209a651e918f651cb..6002639ea24d62bf24e3b397ccdba80b0862eead 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * 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
@@ -59,7 +59,7 @@ static struct session_vdevice *get_vdevice_by_index(int device_index)
 
        /* TODO: Sanity checks on device_index. */
 
-       if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
                sr_err("session driver: %s: device instance with device "
                       "index %d was not found", __func__, device_index);
                return NULL;
@@ -138,7 +138,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
 }
 
 /* driver callbacks */
-static void hw_cleanup(void);
+static int hw_cleanup(void);
 
 /**
  * TODO.
@@ -149,7 +149,6 @@ static void hw_cleanup(void);
  */
 static int hw_init(const char *deviceinfo)
 {
-
        sessionfile = g_strdup(deviceinfo);
 
        return 0;
@@ -159,12 +158,14 @@ static int hw_init(const char *deviceinfo)
  * TODO.
  *
  */
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
        GSList *l;
 
+       /* TODO: Error handling. */
+
        for (l = device_instances; l; l = l->next)
-               sr_device_instance_free(l->data);
+               sr_dev_inst_free(l->data);
 
        g_slist_free(device_instances);
        device_instances = NULL;
@@ -172,13 +173,15 @@ static void hw_cleanup(void)
        sr_session_source_remove(-1);
 
        g_free(sessionfile);
+
+       return SR_OK;
 }
 
 static int hw_opendev(int device_index)
 {
        struct sr_device_instance *sdi;
 
-       sdi = sr_device_instance_new(device_index, SR_ST_INITIALIZING,
+       sdi = sr_dev_inst_new(device_index, SR_ST_INITIALIZING,
                NULL, NULL, NULL);
        if (!sdi)
                return SR_ERR;
@@ -214,7 +217,7 @@ static int hw_get_status(int device_index)
        /* Avoid compiler warnings. */
        (void)device_index;
 
-       if (sr_device_list() != NULL)
+       if (sr_dev_list() != NULL)
                return SR_OK;
        else
                return SR_ERR;