sr: Some more s/device_instance/dev_inst/.

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index e2cbe30de6eeeb8e3a27400762356c2b8255f496..d6e149de7fb86254f1c33c1c2c8d0ceb0f7c634c 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -64,7 +64,7 @@ enum {
 };
 
 /* FIXME: Should not be global. */
-static GIOChannel *channels[2];
+SR_PRIV GIOChannel *channels[2];
 
 struct databag {
        int pipe_fds[2];
@@ -125,8 +125,8 @@ static uint8_t pattern_sigrok[] = {
        0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
-static GSList *device_instances = NULL;
+/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+static GSList *dev_insts = NULL;
 static uint64_t cur_samplerate = SR_KHZ(200);
 static uint64_t limit_samples = 0;
 static uint64_t limit_msec = 0;
@@ -134,22 +134,22 @@ static int default_pattern = PATTERN_SIGROK;
 static GThread *my_thread;
 static int thread_running;
 
-static void hw_stop_acquisition(int device_index, gpointer session_data);
+static int hw_stop_acquisition(int device_index, gpointer session_data);
 
 static int hw_init(const char *deviceinfo)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
 
        /* Avoid compiler warnings. */
        (void)deviceinfo;
 
-       sdi = sr_device_instance_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
+       sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
        if (!sdi) {
-               sr_err("demo: %s: sr_device_instance_new failed", __func__);
+               sr_err("demo: %s: sr_dev_inst_new failed", __func__);
                return 0;
        }
 
-       device_instances = g_slist_append(device_instances, sdi);
+       dev_insts = g_slist_append(dev_insts, sdi);
 
        return 1;
 }
@@ -174,17 +174,18 @@ static int hw_closedev(int device_index)
        return SR_OK;
 }
 
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
        /* Nothing needed so far. */
+       return SR_OK;
 }
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        void *info = NULL;
 
-       if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("demo: %s: sdi was NULL", __func__);
                return NULL;
        }
@@ -469,7 +470,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
        gettimeofday(&header->starttime, NULL);
        header->samplerate = cur_samplerate;
        header->num_logic_probes = NUM_PROBES;
-       header->num_analog_probes = 0;
        sr_session_bus(session_data, packet);
        g_free(header);
        g_free(packet);
@@ -477,7 +477,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
        return SR_OK;
 }
 
-static void hw_stop_acquisition(int device_index, gpointer session_data)
+static int hw_stop_acquisition(int device_index, gpointer session_data)
 {
        /* Avoid compiler warnings. */
        (void)device_index;
@@ -485,6 +485,8 @@ static void hw_stop_acquisition(int device_index, gpointer session_data)
 
        /* Stop generate thread. */
        thread_running = 0;
+
+       return SR_OK;
 }
 
 SR_PRIV struct sr_device_plugin demo_plugin_info = {