Prefixes for *_device_instance.

[libsigrok.git] / hardware / asix-sigma / asix-sigma.c

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 1162b63cfbe3d81deab961370157344c9a640d07..f085c85ce0ce776cfac2c0413a1c79c21fefa9cf 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -526,7 +526,7 @@ static int hw_opendev(int device_index)
        struct sigma *sigma;
        int ret;
 
-       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return SR_ERR;
 
        sigma = sdi->priv;
@@ -669,7 +669,7 @@ static void hw_closedev(int device_index)
        struct sr_device_instance *sdi;
        struct sigma *sigma;
 
-       if ((sdi = get_sr_device_instance(device_instances, device_index)))
+       if ((sdi = sr_get_device_instance(device_instances, device_index)))
        {
                sigma = sdi->priv;
                if (sdi->status == ST_ACTIVE)
@@ -701,7 +701,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
        struct sigma *sigma;
        void *info = NULL;
 
-       if (!(sdi = get_sr_device_instance(device_instances, device_index))) {
+       if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
                fprintf(stderr, "It's NULL.\n");
                return NULL;
        }
@@ -733,7 +733,7 @@ static int hw_get_status(int device_index)
 {
        struct sr_device_instance *sdi;
 
-       sdi = get_sr_device_instance(device_instances, device_index);
+       sdi = sr_get_device_instance(device_instances, device_index);
        if (sdi)
                return sdi->status;
        else
@@ -751,7 +751,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        struct sigma *sigma;
        int ret;
 
-       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return SR_ERR;
 
        sigma = sdi->priv;
@@ -827,7 +827,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
        struct sigma *sigma = sdi->priv;
        uint16_t tsdiff, ts;
        uint16_t samples[65536 * sigma->samples_per_event];
-       struct datafeed_packet packet;
+       struct sr_datafeed_packet packet;
        int i, j, k, l, numpad, tosend;
        size_t n = 0, sent = 0;
        int clustersize = EVENTS_PER_CLUSTER * sigma->samples_per_event;
@@ -954,7 +954,7 @@ static int receive_data(int fd, int revents, void *user_data)
 {
        struct sr_device_instance *sdi = user_data;
        struct sigma *sigma = sdi->priv;
-       struct datafeed_packet packet;
+       struct sr_datafeed_packet packet;
        const int chunks_per_read = 32;
        unsigned char buf[chunks_per_read * CHUNK_SIZE];
        int bufsz, numchunks, i, newchunks;
@@ -1200,8 +1200,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
        struct sr_device_instance *sdi;
        struct sigma *sigma;
-       struct datafeed_packet packet;
-       struct datafeed_header header;
+       struct sr_datafeed_packet packet;
+       struct sr_datafeed_header header;
        struct clockselect_50 clockselect;
        int frac;
        uint8_t triggerselect;
@@ -1211,7 +1211,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
        session_device_id = session_device_id;
 
-       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return SR_ERR;
 
        sigma = sdi->priv;
@@ -1296,7 +1296,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
        /* Send header packet to the session bus. */
        packet.type = DF_HEADER;
-       packet.length = sizeof(struct datafeed_header);
+       packet.length = sizeof(struct sr_datafeed_header);
        packet.payload = &header;
        header.feed_version = 1;
        gettimeofday(&header.starttime, NULL);
@@ -1320,7 +1320,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
        struct sigma *sigma;
        uint8_t modestatus;
 
-       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return;
 
        sigma = sdi->priv;
@@ -1349,8 +1349,9 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
        sigma->state.state = SIGMA_DOWNLOAD;
 }
 
-struct device_plugin asix_sigma_plugin_info = {
+struct sr_device_plugin asix_sigma_plugin_info = {
        "asix-sigma",
+       "ASIX SIGMA",
        1,
        hw_init,
        hw_cleanup,