Add sr_ prefix to receive_data_callback typedef.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index 2a727c86f7d4c62def8428dcb53f2800a87aa702..4d70b3514e92404dc49e7c9fa78271f0a78c918f 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -26,18 +26,18 @@
 #include <glib/gstdio.h>
 #include <sigrok.h>
 
-extern struct session *session;
+extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
 
-int session_load(const char *filename)
+int sr_session_load(const char *filename)
 {
        GKeyFile *kf;
        GPtrArray *capturefiles;
        struct zip *archive;
        struct zip_file *zf;
        struct zip_stat zs;
-       struct session *session;
+       struct sr_session *session;
        struct sr_device *device;
        struct sr_probe *probe;
        int ret, err, probenum, devcnt, i, j;
@@ -77,7 +77,7 @@ int session_load(const char *filename)
                return SR_ERR;
        }
 
-       session = session_new();
+       session = sr_session_new();
 
        devcnt = 0;
        capturefiles = g_ptr_array_new_with_free_func(g_free);
@@ -94,11 +94,11 @@ int session_load(const char *filename)
                        for (j = 0; keys[j]; j++) {
                                val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
                                if (!strcmp(keys[j], "capturefile")) {
-                                       device = device_new(&session_driver, devcnt, 0);
+                                       device = sr_device_new(&session_driver, devcnt, 0);
                                        if (devcnt == 0)
                                                /* first device, init the plugin */
                                                device->plugin->init((char *)filename);
-                                       session_device_add(device);
+                                       sr_session_device_add(device);
                                        device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val);
                                        g_ptr_array_add(capturefiles, val);
                                } else if (!strcmp(keys[j], "samplerate")) {
@@ -111,16 +111,16 @@ int session_load(const char *filename)
                                        total_probes = strtoull(val, NULL, 10);
                                        device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
                                        for (p = 1; p <= total_probes; p++)
-                                               device_probe_add(device, NULL);
+                                               sr_device_probe_add(device, NULL);
                                } else if (!strncmp(keys[j], "probe", 5)) {
                                        if (!device)
                                                continue;
                                        enabled_probes++;
                                        tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-                                       device_probe_name(device, tmp_u64, val);
+                                       sr_device_probe_name(device, tmp_u64, val);
                                } else if (!strncmp(keys[j], "trigger", 7)) {
                                        probenum = strtoul(keys[j]+7, NULL, 10);
-                                       device_trigger_set(device, probenum, val);
+                                       sr_device_trigger_set(device, probenum, val);
                                }
                        }
                        g_strfreev(keys);
@@ -136,13 +136,13 @@ int session_load(const char *filename)
        return SR_OK;
 }
 
-int session_save(char *filename)
+int sr_session_save(const char *filename)
 {
        GSList *l, *p, *d;
        FILE *meta;
        struct sr_device *device;
        struct sr_probe *probe;
-       struct datastore *ds;
+       struct sr_datastore *ds;
        struct zip *zipfile;
        struct zip_source *versrc, *metasrc, *logicsrc;
        int bufcnt, devcnt, tmpfile, ret, error, probecnt;
@@ -189,7 +189,7 @@ int session_save(char *filename)
                        fprintf(meta, "capturefile = logic-%d\n", devcnt);
                        fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
                        fprintf(meta, "total probes = %d\n", g_slist_length(device->probes));
-                       if (device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+                       if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
                                samplerate = *((uint64_t *) device->plugin->get_device_info(
                                                device->plugin_index, SR_DI_CUR_SAMPLERATE));
                                s = sr_samplerate_string(samplerate);