Change all sigrok_ prefixes to sr_.

[libsigrok.git] / hardware / saleae-logic / saleae-logic.c

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index ba50ee94ea3ea6af15b47360d9cf2588eaf58ec7..dfc07f9b74774f6f68f8e410ffb3c7c2110fc723 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <libusb.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "config.h"
 
 #define USB_VENDOR                 0x0925
@@ -58,7 +59,7 @@ static int capabilities[] = {
        0,
 };
 
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
 static GSList *device_instances = NULL;
 
 /*
@@ -165,14 +166,14 @@ int check_conf_profile(libusb_device *dev)
        return ret;
 }
 
-struct sigrok_device_instance *sl_open_device(int device_index)
+struct sr_device_instance *sl_open_device(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        libusb_device **devlist;
        struct libusb_device_descriptor des;
        int err, skip, i;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
                return NULL;
 
        libusb_get_device_list(usb_context, &devlist);
@@ -227,7 +228,7 @@ int upload_firmware(libusb_device *dev)
        return 0;
 }
 
-static void close_device(struct sigrok_device_instance *sdi)
+static void close_device(struct sr_device_instance *sdi)
 {
        if (sdi->usb->devhdl == NULL)
                return;
@@ -270,7 +271,7 @@ static int configure_probes(GSList *probes)
                                trigger_value[stage] |= probe_bit;
                        stage++;
                        if (stage > NUM_TRIGGER_STAGES)
-                               return SIGROK_ERR;
+                               return SR_ERR;
                }
        }
 
@@ -283,7 +284,7 @@ static int configure_probes(GSList *probes)
        else
                trigger_stage = 0;
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 /*
@@ -292,7 +293,7 @@ static int configure_probes(GSList *probes)
 
 static int hw_init(char *deviceinfo)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
        int err, devcnt, i;
@@ -318,7 +319,7 @@ static int hw_init(char *deviceinfo)
                if (des.idVendor != USB_VENDOR || des.idProduct != USB_PRODUCT)
                        continue; /* Not a Saleae Logic... */
 
-               sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING,
+               sdi = sr_device_instance_new(devcnt, ST_INITIALIZING,
                        USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
                if (!sdi)
                        return 0;
@@ -352,7 +353,7 @@ static int hw_init(char *deviceinfo)
 static int hw_opendev(int device_index)
 {
        GTimeVal cur_time;
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        int timediff, err;
        unsigned int cur, upd;
 
@@ -374,30 +375,30 @@ static int hw_opendev(int device_index)
 
        if (!(sdi = sl_open_device(device_index))) {
                g_warning("unable to open device");
-               return SIGROK_ERR;
+               return SR_ERR;
        }
 
        err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
        if (err != 0) {
                g_warning("Unable to claim interface: %d", err);
-               return SIGROK_ERR;
+               return SR_ERR;
        }
 
        if (cur_samplerate == 0) {
                /* Samplerate hasn't been set; default to the slowest one. */
                if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
-                   &supported_samplerates[0]) == SIGROK_ERR)
-                       return SIGROK_ERR;
+                   &supported_samplerates[0]) == SR_ERR)
+                       return SR_ERR;
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 static void hw_closedev(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
-       if ((sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if ((sdi = get_sr_device_instance(device_instances, device_index)))
                close_device(sdi);
 }
 
@@ -407,7 +408,7 @@ static void hw_cleanup(void)
 
        /* Properly close all devices... */
        for (l = device_instances; l; l = l->next)
-               close_device((struct sigrok_device_instance *)l->data);
+               close_device((struct sr_device_instance *)l->data);
 
        /* ...and free all their memory. */
        for (l = device_instances; l; l = l->next)
@@ -422,10 +423,10 @@ static void hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        void *info = NULL;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
                return NULL;
 
        switch (device_info_id) {
@@ -451,9 +452,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
-       sdi = get_sigrok_device_instance(device_instances, device_index);
+       sdi = get_sr_device_instance(device_instances, device_index);
        if (sdi)
                return sdi->status;
        else
@@ -465,7 +466,7 @@ static int *hw_get_capabilities(void)
        return capabilities;
 }
 
-static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
+static int set_configuration_samplerate(struct sr_device_instance *sdi,
                                        uint64_t samplerate)
 {
        uint8_t divider;
@@ -477,7 +478,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
                        break;
        }
        if (supported_samplerates[i] == 0)
-               return SIGROK_ERR_SAMPLERATE;
+               return SR_ERR_SAMPLERATE;
 
        divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
 
@@ -489,21 +490,21 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
                                   buf, 2, &result, 500);
        if (ret != 0) {
                g_warning("failed to set samplerate: %d", ret);
-               return SIGROK_ERR;
+               return SR_ERR;
        }
        cur_samplerate = samplerate;
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        int ret;
        uint64_t *tmp_u64;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-               return SIGROK_ERR;
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+               return SR_ERR;
 
        if (capability == HWCAP_SAMPLERATE) {
                tmp_u64 = value;
@@ -513,9 +514,9 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        } else if (capability == HWCAP_LIMIT_SAMPLES) {
                tmp_u64 = value;
                limit_samples = *tmp_u64;
-               ret = SIGROK_OK;
+               ret = SR_OK;
        } else {
-               ret = SIGROK_ERR;
+               ret = SR_ERR;
        }
 
        return ret;
@@ -668,7 +669,7 @@ void receive_transfer(struct libusb_transfer *transfer)
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        struct datafeed_packet *packet;
        struct datafeed_header *header;
        struct libusb_transfer *transfer;
@@ -676,13 +677,13 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        int size, i;
        unsigned char *buf;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-               return SIGROK_ERR;
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+               return SR_ERR;
 
        packet = g_malloc(sizeof(struct datafeed_packet));
        header = g_malloc(sizeof(struct datafeed_header));
        if (!packet || !header)
-               return SIGROK_ERR;
+               return SR_ERR;
 
        /* Start with 2K transfer, subsequently increased to 4K. */
        size = 2048;
@@ -696,7 +697,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
                        /* TODO: Free them all. */
                        libusb_free_transfer(transfer);
                        g_free(buf);
-                       return SIGROK_ERR;
+                       return SR_ERR;
                }
                size = 4096;
        }
@@ -720,7 +721,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        g_free(header);
        g_free(packet);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 /* This stops acquisition on ALL devices, ignoring device_index. */